Skip to content

Commit

Permalink
m68knommu: simplify the ColdFire 5272 GPIO struct setup
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Ungerer committed May 20, 2012
1 parent 60e26cf commit 6621c5c
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 30 deletions.
2 changes: 1 addition & 1 deletion arch/m68k/platform/5272/Makefile
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 intc.o
obj-y := config.o intc.o

11 changes: 11 additions & 0 deletions arch/m68k/platform/5272/config.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include <asm/coldfire.h>
#include <asm/mcfsim.h>
#include <asm/mcfuart.h>
#include <asm/mcfgpio.h>

/***************************************************************************/

Expand All @@ -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;
Expand Down
29 changes: 0 additions & 29 deletions arch/m68k/platform/5272/gpio.c

This file was deleted.

0 comments on commit 6621c5c

Please sign in to comment.