---

yaml --- r: 302663 b: refs/heads/master c: 6621c5c h: refs/heads/master i: 302661: 24204d3 302659: 0dc08f2 302655: c25874a v: v3
git-mirror · May 20, 2012 · bb8a0e9 · bb8a0e9
1 parent 495c6db
commit bb8a0e9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 31 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60e26cfd0bd4c1ee682c8c50378e650823ce6d2f
+refs/heads/master: 6621c5cde9c308ce3b08d5954bb8443d853d9888
diff --git a/trunk/arch/m68k/platform/5272/Makefile b/trunk/arch/m68k/platform/5272/Makefile
@@ -14,5 +14,5 @@
 
 asflags-$(CONFIG_FULLDEBUG) := -DDEBUGGER_COMPATIBLE_CACHE=1
 
-obj-y := config.o gpio.o intc.o
+obj-y := config.o intc.o
 
diff --git a/trunk/arch/m68k/platform/5272/config.c b/trunk/arch/m68k/platform/5272/config.c
@@ -19,6 +19,7 @@
 #include <asm/coldfire.h>
 #include <asm/mcfsim.h>
 #include <asm/mcfuart.h>
+#include <asm/mcfgpio.h>
 
 /***************************************************************************/
 
@@ -30,6 +31,16 @@ unsigned char ledbank = 0xff;
 
 /***************************************************************************/
 
+struct mcf_gpio_chip mcf_gpio_chips[] = {
+	MCFGPS(PA,  0, 16, MCFSIM_PADDR, MCFSIM_PADAT, MCFSIM_PADAT),
+	MCFGPS(PB, 16, 16, MCFSIM_PBDDR, MCFSIM_PBDAT, MCFSIM_PBDAT),
+	MCFGPS(Pc, 32, 16, MCFSIM_PCDDR, MCFSIM_PCDAT, MCFSIM_PCDAT),
+};
+
+unsigned int mcf_gpio_chips_size = ARRAY_SIZE(mcf_gpio_chips);
+
+/***************************************************************************/
+
 static void __init m5272_uarts_init(void)
 {
 	u32 v;

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

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

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