---

yaml --- r: 302661 b: refs/heads/master c: 045f8c4 h: refs/heads/master i: 302659: 0dc08f2 v: v3
git-mirror · May 20, 2012 · 24204d3 · 24204d3
1 parent 0d6fe9f
commit 24204d3
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 42 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a10cf320d84ab2df0b7c12ace86b0620cfadabb1
+refs/heads/master: 045f8c4af4f8cdfddf00a2482573d638cbc7a863
diff --git a/trunk/arch/m68k/platform/523x/Makefile b/trunk/arch/m68k/platform/523x/Makefile
@@ -14,4 +14,4 @@
 
 asflags-$(CONFIG_FULLDEBUG) := -DDEBUGGER_COMPATIBLE_CACHE=1
 
-obj-y := config.o gpio.o
+obj-y := config.o
diff --git a/trunk/arch/m68k/platform/523x/config.c b/trunk/arch/m68k/platform/523x/config.c
@@ -19,6 +19,28 @@
 #include <asm/machdep.h>
 #include <asm/coldfire.h>
 #include <asm/mcfsim.h>
+#include <asm/mcfgpio.h>
+
+/***************************************************************************/
+
+struct mcf_gpio_chip mcf_gpio_chips[] = {
+	MCFGPS(PIRQ, 1, 7, MCFEPORT_EPDDR, MCFEPORT_EPDR, MCFEPORT_EPPDR),
+	MCFGPF(ADDR, 13, 3),
+	MCFGPF(DATAH, 16, 8),
+	MCFGPF(DATAL, 24, 8),
+	MCFGPF(BUSCTL, 32, 8),
+	MCFGPF(BS, 40, 4),
+	MCFGPF(CS, 49, 7),
+	MCFGPF(SDRAM, 56, 6),
+	MCFGPF(FECI2C, 64, 4),
+	MCFGPF(UARTH, 72, 2),
+	MCFGPF(UARTL, 80, 8),
+	MCFGPF(QSPI, 88, 5),
+	MCFGPF(TIMER, 96, 8),
+	MCFGPF(ETPU, 104, 3),
+};
+
+unsigned int mcf_gpio_chips_size = ARRAY_SIZE(mcf_gpio_chips);
 
 /***************************************************************************/
 

diff --git a/trunk/arch/m68k/platform/523x/gpio.c b/trunk/arch/m68k/platform/523x/gpio.c
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,4 +14,4 @@

		asflags-$(CONFIG_FULLDEBUG) := -DDEBUGGER_COMPATIBLE_CACHE=1

		obj-y := config.o gpio.o
		obj-y := config.o