diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2012-04-17 14:19:11 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2012-05-20 21:21:52 +1000 |
| commit | 6621c5cde9c308ce3b08d5954bb8443d853d9888 (patch) | |
| tree | 5042a86d6ea895b6f70bc71fd856e29dcf7f597a /arch/m68k | |
| parent | 60e26cfd0bd4c1ee682c8c50378e650823ce6d2f (diff) | |
m68knommu: simplify the ColdFire 5272 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/m68k')
| -rw-r--r-- | arch/m68k/platform/5272/Makefile | 2 | ||||
| -rw-r--r-- | arch/m68k/platform/5272/config.c | 11 | ||||
| -rw-r--r-- | arch/m68k/platform/5272/gpio.c | 29 |
3 files changed, 12 insertions, 30 deletions
diff --git a/arch/m68k/platform/5272/Makefile b/arch/m68k/platform/5272/Makefile index 34110fc1430..932ddabdfe8 100644 --- a/arch/m68k/platform/5272/Makefile +++ b/arch/m68k/platform/5272/Makefile @@ -14,5 +14,5 @@ asflags-$(CONFIG_FULLDEBUG) := -DDEBUGGER_COMPATIBLE_CACHE=1 -obj-y := config.o gpio.o intc.o +obj-y := config.o intc.o diff --git a/arch/m68k/platform/5272/config.c b/arch/m68k/platform/5272/config.c index e68bc7a148e..43e36060da1 100644 --- a/arch/m68k/platform/5272/config.c +++ b/arch/m68k/platform/5272/config.c @@ -19,6 +19,7 @@ #include <asm/coldfire.h> #include <asm/mcfsim.h> #include <asm/mcfuart.h> +#include <asm/mcfgpio.h> /***************************************************************************/ @@ -30,6 +31,16 @@ unsigned char ledbank = 0xff; /***************************************************************************/ +struct mcf_gpio_chip mcf_gpio_chips[] = { + MCFGPS(PA, 0, 16, MCFSIM_PADDR, MCFSIM_PADAT, MCFSIM_PADAT), + MCFGPS(PB, 16, 16, MCFSIM_PBDDR, MCFSIM_PBDAT, MCFSIM_PBDAT), + MCFGPS(Pc, 32, 16, MCFSIM_PCDDR, MCFSIM_PCDAT, MCFSIM_PCDAT), +}; + +unsigned int mcf_gpio_chips_size = ARRAY_SIZE(mcf_gpio_chips); + +/***************************************************************************/ + static void __init m5272_uarts_init(void) { u32 v; diff --git a/arch/m68k/platform/5272/gpio.c b/arch/m68k/platform/5272/gpio.c deleted file mode 100644 index c029dab7baf..00000000000 --- a/arch/m68k/platform/5272/gpio.c +++ /dev/null @@ -1,29 +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(PA, 0, 16, MCFSIM_PADDR, MCFSIM_PADAT, MCFSIM_PADAT), - MCFGPS(PB, 16, 16, MCFSIM_PBDDR, MCFSIM_PBDAT, MCFSIM_PBDAT), - MCFGPS(Pc, 32, 16, MCFSIM_PCDDR, MCFSIM_PCDAT, MCFSIM_PCDAT), -}; - -unsigned int mcf_gpio_chips_size = ARRAY_SIZE(mcf_gpio_chips); |