diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2012-04-16 02:11:11 -0400 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2012-05-20 07:21:41 -0400 |
| commit | 56248926ecc1888b3273a09e5c50ffc389191f7e (patch) | |
| tree | f5f8923dc80f068e3b8e199cf91f8718047d36e6 /arch/m68k | |
| parent | 32ec63508939e0605fc057ecdd062f307e86f5b2 (diff) | |
m68knommu: switch to GPIO init macros in ColdFire 5249 init code
Modify the GPIO setup table to use the mcfgpio.h macros for table init.
Simplifies code and reduces line count significantly.
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/5249/gpio.c | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/arch/m68k/platform/5249/gpio.c b/arch/m68k/platform/5249/gpio.c index 2b56c6ef65bf..775d618b9a44 100644 --- a/arch/m68k/platform/5249/gpio.c +++ b/arch/m68k/platform/5249/gpio.c | |||
| @@ -21,37 +21,8 @@ | |||
| 21 | #include <asm/mcfgpio.h> | 21 | #include <asm/mcfgpio.h> |
| 22 | 22 | ||
| 23 | static struct mcf_gpio_chip mcf_gpio_chips[] = { | 23 | static struct mcf_gpio_chip mcf_gpio_chips[] = { |
| 24 | { | 24 | MCFGPS(GPIO0, 0, 32, MCFSIM2_GPIOENABLE, MCFSIM2_GPIOWRITE, MCFSIM2_GPIOREAD), |
| 25 | .gpio_chip = { | 25 | MCFGPS(GPIO1, 32, 32, MCFSIM2_GPIO1ENABLE, MCFSIM2_GPIO1WRITE, MCFSIM2_GPIO1READ), |
| 26 | .label = "GPIO0", | ||
| 27 | .request = mcf_gpio_request, | ||
| 28 | .free = mcf_gpio_free, | ||
| 29 | .direction_input = mcf_gpio_direction_input, | ||
| 30 | .direction_output = mcf_gpio_direction_output, | ||
| 31 | .get = mcf_gpio_get_value, | ||
| 32 | .set = mcf_gpio_set_value, | ||
| 33 | .ngpio = 32, | ||
| 34 | }, | ||
| 35 | .pddr = (void __iomem *) MCFSIM2_GPIOENABLE, | ||
| 36 | .podr = (void __iomem *) MCFSIM2_GPIOWRITE, | ||
| 37 | .ppdr = (void __iomem *) MCFSIM2_GPIOREAD, | ||
| 38 | }, | ||
| 39 | { | ||
| 40 | .gpio_chip = { | ||
| 41 | .label = "GPIO1", | ||
| 42 | .request = mcf_gpio_request, | ||
| 43 | .free = mcf_gpio_free, | ||
| 44 | .direction_input = mcf_gpio_direction_input, | ||
| 45 | .direction_output = mcf_gpio_direction_output, | ||
| 46 | .get = mcf_gpio_get_value, | ||
| 47 | .set = mcf_gpio_set_value, | ||
| 48 | .base = 32, | ||
| 49 | .ngpio = 32, | ||
| 50 | }, | ||
| 51 | .pddr = (void __iomem *) MCFSIM2_GPIO1ENABLE, | ||
| 52 | .podr = (void __iomem *) MCFSIM2_GPIO1WRITE, | ||
| 53 | .ppdr = (void __iomem *) MCFSIM2_GPIO1READ, | ||
| 54 | }, | ||
| 55 | }; | 26 | }; |
| 56 | 27 | ||
| 57 | static int __init mcf_gpio_init(void) | 28 | static int __init mcf_gpio_init(void) |