m68knommu: simplify the ColdFire 532x 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/532x/Makefile b/arch/m68k/platform/532x/Makefile
index ce01669399c64b45000bceef184185a7e27b4835..c0d8cf88f4fd40e40ab4de327248e72b652d5003 100644 (file)
--- a/arch/m68k/platform/532x/Makefile
+++ b/arch/m68k/platform/532x/Makefile
@@ -15,4 +15,4 @@
 asflags-$(CONFIG_FULLDEBUG) := -DDEBUGGER_COMPATIBLE_CACHE=1
 
 #obj-y := config.o usb-mcf532x.o spi-mcf532x.o
-obj-y := config.o gpio.o
+obj-y := config.o

diff --git a/arch/m68k/platform/532x/config.c b/arch/m68k/platform/532x/config.c
index 37082d02f2bd7b3acfdc5797756fb21965702b9f..8e9476d59a6516e42efb49069b415f6f3c56e773 100644 (file)
--- a/arch/m68k/platform/532x/config.c
+++ b/arch/m68k/platform/532x/config.c
@@ -26,10 +26,35 @@
 #include <asm/mcfsim.h>
 #include <asm/mcfuart.h>
 #include <asm/mcfdma.h>
+#include <asm/mcfgpio.h>
 #include <asm/mcfwdebug.h>
 
 /***************************************************************************/
 
+struct mcf_gpio_chip mcf_gpio_chips[] = {
+       MCFGPS(PIRQ, 0, 8, MCFEPORT_EPDDR, MCFEPORT_EPDR, MCFEPORT_EPPDR),
+       MCFGPF(FECH, 8, 8),
+       MCFGPF(FECL, 16, 8),
+       MCFGPF(SSI, 24, 5),
+       MCFGPF(BUSCTL, 32, 4),
+       MCFGPF(BE, 40, 4),
+       MCFGPF(CS, 49, 5),
+       MCFGPF(PWM, 58, 4),
+       MCFGPF(FECI2C, 64, 4),
+       MCFGPF(UART, 72, 8),
+       MCFGPF(QSPI, 80, 6),
+       MCFGPF(TIMER, 88, 4),
+       MCFGPF(LCDDATAH, 96, 2),
+       MCFGPF(LCDDATAM, 104, 8),
+       MCFGPF(LCDDATAL, 112, 8),
+       MCFGPF(LCDCTLH, 120, 1),
+       MCFGPF(LCDCTLL, 128, 8),
+};
+
+unsigned int mcf_gpio_chips_size = ARRAY_SIZE(mcf_gpio_chips);
+
+/***************************************************************************/
+
 #if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)
 
 static void __init m532x_qspi_init(void)

diff --git a/arch/m68k/platform/532x/gpio.c b/arch/m68k/platform/532x/gpio.c
deleted file mode 100644 (file)
index 3e1b71d..0000000
--- a/arch/m68k/platform/532x/gpio.c
+++ /dev/null
@@ -1,43 +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(FECH, 8, 8),
-       MCFGPF(FECL, 16, 8),
-       MCFGPF(SSI, 24, 5),
-       MCFGPF(BUSCTL, 32, 4),
-       MCFGPF(BE, 40, 4),
-       MCFGPF(CS, 49, 5),
-       MCFGPF(PWM, 58, 4),
-       MCFGPF(FECI2C, 64, 4),
-       MCFGPF(UART, 72, 8),
-       MCFGPF(QSPI, 80, 6),
-       MCFGPF(TIMER, 88, 4),
-       MCFGPF(LCDDATAH, 96, 2),
-       MCFGPF(LCDDATAM, 104, 8),
-       MCFGPF(LCDDATAL, 112, 8),
-       MCFGPF(LCDCTLH, 120, 1),
-       MCFGPF(LCDCTLL, 128, 8),
-};
-
-unsigned int mcf_gpio_chips_size = ARRAY_SIZE(mcf_gpio_chips);