summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2012-04-17 14:27:45 +1000
committerGreg Ungerer <gerg@uclinux.org>2012-05-20 21:21:57 +1000
commitf198f9cd857a1a59f94a56fa5a6fbfc437a2bc0a (patch)
tree4c256aa07885db81470174b07730ba4d1719c403 /arch
parentbb70e21b5268b9d7b591bef442c10b9d368eb93d (diff)
downloadlinux-f198f9cd857a1a59f94a56fa5a6fbfc437a2bc0a.tar.bz2
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 <gerg@uclinux.org> Acked-by: Steven King <sfking@fdwdc.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/m68k/platform/5407/Makefile2
-rw-r--r--arch/m68k/platform/5407/config.c9
-rw-r--r--arch/m68k/platform/5407/gpio.c27
3 files changed, 10 insertions, 28 deletions
diff --git a/arch/m68k/platform/5407/Makefile b/arch/m68k/platform/5407/Makefile
index e83fe148eddc..24f3cd70d45d 100644
--- 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
index bb6c746ae819..faa6680b3404 100644
--- 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
deleted file mode 100644
index 7bbbea7a8556..000000000000
--- a/arch/m68k/platform/5407/gpio.c
+++ /dev/null
@@ -1,27 +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(PP, 0, 16, MCFSIM_PADDR, MCFSIM_PADAT, MCFSIM_PADAT),
-};
-
-unsigned int mcf_gpio_chips_size = ARRAY_SIZE(mcf_gpio_chips);