m68knommu: simplify the ColdFire 520x 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 <gerg@uclinux.org>
Acked-by: Steven King <sfking@fdwdc.com>

diff --git a/arch/m68k/platform/520x/Makefile b/arch/m68k/platform/520x/Makefile
index ad3f4e5a57cee62ace23d1d3770bbe1f48175cc5..03e29d1347634184fe5f6f39c00b2061e8dbf246 100644 (file)
--- a/arch/m68k/platform/520x/Makefile
+++ b/arch/m68k/platform/520x/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/arch/m68k/platform/520x/config.c b/arch/m68k/platform/520x/config.c
index 09df4b89e8be1ee04711df00fb715037edc473d7..3264b8883d5f8cc1afdf5b98c2a8dabe29a7cfea 100644 (file)
--- a/arch/m68k/platform/520x/config.c
+++ b/arch/m68k/platform/520x/config.c
@@ -19,6 +19,22 @@
 #include <asm/coldfire.h>
 #include <asm/mcfsim.h>
 #include <asm/mcfuart.h>
+#include <asm/mcfgpio.h>
+
+/***************************************************************************/
+
+struct mcf_gpio_chip mcf_gpio_chips[] = {
+       MCFGPS(PIRQ, 0, 8, MCFEPORT_EPDDR, MCFEPORT_EPDR, MCFEPORT_EPPDR),
+       MCFGPF(CS, 9, 3),
+       MCFGPF(FECI2C, 16, 4),
+       MCFGPF(QSPI, 24, 4),
+       MCFGPF(TIMER, 32, 4),
+       MCFGPF(UART, 40, 8),
+       MCFGPF(FECH, 48, 8),
+       MCFGPF(FECL, 56, 8),
+};
+
+unsigned int mcf_gpio_chips_size = ARRAY_SIZE(mcf_gpio_chips);
 
 /***************************************************************************/
 

diff --git a/arch/m68k/platform/520x/gpio.c b/arch/m68k/platform/520x/gpio.c
deleted file mode 100644 (file)
index 49387c3..0000000
--- a/arch/m68k/platform/520x/gpio.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Coldfire generic GPIO support
- *
- * (C) Copyright 2009, Steven King <sfking@fdwdc.com>
- *
- * 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; version 2 of the License.
- *
- * 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.
-*/
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-
-#include <asm/coldfire.h>
-#include <asm/mcfsim.h>
-#include <asm/mcfgpio.h>
-
-struct mcf_gpio_chip mcf_gpio_chips[] = {
-       MCFGPS(PIRQ, 0, 8, MCFEPORT_EPDDR, MCFEPORT_EPDR, MCFEPORT_EPPDR),
-       MCFGPF(CS, 9, 3),
-       MCFGPF(FECI2C, 16, 4),
-       MCFGPF(QSPI, 24, 4),
-       MCFGPF(TIMER, 32, 4),
-       MCFGPF(UART, 40, 8),
-       MCFGPF(FECH, 48, 8),
-       MCFGPF(FECL, 56, 8),
-};
-
-unsigned int mcf_gpio_chips_size = ARRAY_SIZE(mcf_gpio_chips);