---

yaml --- r: 302662 b: refs/heads/master c: 60e26cf h: refs/heads/master v: v3
git-mirror · May 20, 2012 · 495c6db · 495c6db
1 parent 24204d3
commit 495c6db
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 30 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 045f8c4af4f8cdfddf00a2482573d638cbc7a863
+refs/heads/master: 60e26cfd0bd4c1ee682c8c50378e650823ce6d2f
diff --git a/trunk/arch/m68k/platform/5249/Makefile b/trunk/arch/m68k/platform/5249/Makefile
@@ -14,5 +14,5 @@
 
 asflags-$(CONFIG_FULLDEBUG) := -DDEBUGGER_COMPATIBLE_CACHE=1
 
-obj-y := config.o gpio.o intc2.o
+obj-y := config.o intc2.o
 
diff --git a/trunk/arch/m68k/platform/5249/config.c b/trunk/arch/m68k/platform/5249/config.c
@@ -16,6 +16,16 @@
 #include <asm/machdep.h>
 #include <asm/coldfire.h>
 #include <asm/mcfsim.h>
+#include <asm/mcfgpio.h>
+
+/***************************************************************************/
+
+struct mcf_gpio_chip mcf_gpio_chips[] = {
+	MCFGPS(GPIO0, 0, 32, MCFSIM2_GPIOENABLE, MCFSIM2_GPIOWRITE, MCFSIM2_GPIOREAD),
+	MCFGPS(GPIO1, 32, 32, MCFSIM2_GPIO1ENABLE, MCFSIM2_GPIO1WRITE, MCFSIM2_GPIO1READ),
+};
+
+unsigned int mcf_gpio_chips_size = ARRAY_SIZE(mcf_gpio_chips);
 
 /***************************************************************************/
 

diff --git a/trunk/arch/m68k/platform/5249/gpio.c b/trunk/arch/m68k/platform/5249/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 intc2.o
		obj-y := config.o intc2.o