m68knommu: simplify the ColdFire 5407 GPIO struct setup

The GPIO data struct setup is now the only remaining code in the platform gpio.c file. So move it to the platform config.c code and remove the gpio.c file. Signed-off-by: Greg Ungerer <[email protected]> Acked-by: Steven King <[email protected]>
josf · May 20, 2012 · f198f9c · f198f9c
1 parent bb70e21
commit f198f9c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 28 deletions.
diff --git a/arch/m68k/platform/5407/Makefile b/arch/m68k/platform/5407/Makefile
@@ -14,5 +14,5 @@
 
 asflags-$(CONFIG_FULLDEBUG) := -DDEBUGGER_COMPATIBLE_CACHE=1
 
-obj-y := config.o gpio.o
+obj-y := config.o
 
diff --git a/arch/m68k/platform/5407/config.c b/arch/m68k/platform/5407/config.c
@@ -16,6 +16,15 @@
 #include <asm/machdep.h>
 #include <asm/coldfire.h>
 #include <asm/mcfsim.h>
+#include <asm/mcfgpio.h>
+
+/***************************************************************************/
+
+struct mcf_gpio_chip mcf_gpio_chips[] = {
+	MCFGPS(PP, 0, 16, MCFSIM_PADDR, MCFSIM_PADAT, MCFSIM_PADAT),
+};
+
+unsigned int mcf_gpio_chips_size = ARRAY_SIZE(mcf_gpio_chips);
 
 /***************************************************************************/
 

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