In order to use the IMX i2c driver on the mpc85xx SOC, the file
mach/clocks.h is renamed mach/clock.h. Files using this header are updated
accordingly. The file mach/generic.h is also added to accommodate the driver.
Finally, there is a clean up of a line too long.
Signed-off-by: Renaud Barbier <renaud.barbier@xxxxxx>
---
arch/ppc/boards/freescale-p2020rdb/p2020rdb.c | 6 ++--
.../include/mach/{clocks.h => clock.h} | 0
arch/ppc/mach-mpc85xx/include/mach/generic.h | 24 ++++++++++++++++++++
arch/ppc/mach-mpc85xx/speed.c | 2 +-
arch/ppc/mach-mpc85xx/time.c | 2 +-
5 files changed, 29 insertions(+), 5 deletions(-)
rename arch/ppc/mach-mpc85xx/include/mach/{clocks.h => clock.h} (100%)
create mode 100644 arch/ppc/mach-mpc85xx/include/mach/generic.h
diff --git a/arch/ppc/boards/freescale-p2020rdb/p2020rdb.c b/arch/ppc/boards/freescale-p2020rdb/p2020rdb.c
index 734fef9..2de6cc4 100644
--- a/arch/ppc/boards/freescale-p2020rdb/p2020rdb.c
+++ b/arch/ppc/boards/freescale-p2020rdb/p2020rdb.c
@@ -34,7 +34,7 @@
#include <mach/mpc85xx.h>
#include <mach/mmu.h>
#include <mach/immap_85xx.h>
-#include <mach/clocks.h>
+#include <mach/clock.h>
#include <mach/gianfar.h>
#include <mach/early_udelay.h>
@@ -95,8 +95,8 @@ static int p2020_console_init(void)
{
serial_plat.clock = fsl_get_bus_freq(0);
- add_ns16550_device(DEVICE_ID_DYNAMIC, 0xffe04500, 16, IORESOURCE_MEM_8BIT,
- &serial_plat);
+ add_ns16550_device(DEVICE_ID_DYNAMIC, 0xffe04500, 16,
+ IORESOURCE_MEM_8BIT, &serial_plat);
return 0;
}
diff --git a/arch/ppc/mach-mpc85xx/include/mach/clocks.h b/arch/ppc/mach-mpc85xx/include/mach/clock.h
similarity index 100%
rename from arch/ppc/mach-mpc85xx/include/mach/clocks.h
rename to arch/ppc/mach-mpc85xx/include/mach/clock.h
diff --git a/arch/ppc/mach-mpc85xx/include/mach/generic.h b/arch/ppc/mach-mpc85xx/include/mach/generic.h
new file mode 100644
index 0000000..02f589b
--- /dev/null
+++ b/arch/ppc/mach-mpc85xx/include/mach/generic.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2012 GE Intelligent Platforms, Inc.
+ * (C) Copyright 2010 Juergen Beisert - Pengutronix
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ * File derived from ARM architecture. Added so that the imx i2c driver
+ * can be used.
+ */
+
+#define cpu_is_mx1() (0)
diff --git a/arch/ppc/mach-mpc85xx/speed.c b/arch/ppc/mach-mpc85xx/speed.c
index fff2d22..6778d57 100644
--- a/arch/ppc/mach-mpc85xx/speed.c
+++ b/arch/ppc/mach-mpc85xx/speed.c
@@ -30,7 +30,7 @@
#include <common.h>
#include <asm/processor.h>
-#include <mach/clocks.h>
+#include <mach/clock.h>
#include <mach/immap_85xx.h>
#include <mach/mpc85xx.h>
diff --git a/arch/ppc/mach-mpc85xx/time.c b/arch/ppc/mach-mpc85xx/time.c
index 408a28a..c50591c 100644
--- a/arch/ppc/mach-mpc85xx/time.c
+++ b/arch/ppc/mach-mpc85xx/time.c
@@ -25,7 +25,7 @@
#include <common.h>
#include <clock.h>
#include <init.h>
-#include <mach/clocks.h>
+#include <mach/clock.h>
uint64_t ppc_clocksource_read(void)
{
--
1.7.1
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
