Skip to content

Commit

Permalink
m68knommu: simplify the ColdFire 532x 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 24d4502 commit bb70e21
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 44 deletions.
2 changes: 1 addition & 1 deletion arch/m68k/platform/532x/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
25 changes: 25 additions & 0 deletions arch/m68k/platform/532x/config.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
43 changes: 0 additions & 43 deletions arch/m68k/platform/532x/gpio.c

This file was deleted.

0 comments on commit bb70e21

Please sign in to comment.