diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2012-04-16 02:12:43 -0400 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2012-05-20 07:21:41 -0400 |
| commit | 26b7c8270bb79908df07a7e2e68af6a6116505c9 (patch) | |
| tree | 2803a4259edd785212a5577f84c24a11574a1f52 /arch/m68k | |
| parent | 56248926ecc1888b3273a09e5c50ffc389191f7e (diff) | |
m68knommu: switch to GPIO init macros in ColdFire 5272 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/5272/gpio.c | 50 |
1 files changed, 3 insertions, 47 deletions
diff --git a/arch/m68k/platform/5272/gpio.c b/arch/m68k/platform/5272/gpio.c index 57ac10a5d7f7..91358b830fc9 100644 --- a/arch/m68k/platform/5272/gpio.c +++ b/arch/m68k/platform/5272/gpio.c | |||
| @@ -21,53 +21,9 @@ | |||
| 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(PA, 0, 16, MCFSIM_PADDR, MCFSIM_PADAT, MCFSIM_PADAT), |
| 25 | .gpio_chip = { | 25 | MCFGPS(PB, 16, 16, MCFSIM_PBDDR, MCFSIM_PBDAT, MCFSIM_PBDAT), |
| 26 | .label = "PA", | 26 | MCFGPS(Pc, 32, 16, MCFSIM_PCDDR, MCFSIM_PCDAT, MCFSIM_PCDAT), |
| 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 = 16, | ||
| 34 | }, | ||
| 35 | .pddr = (void __iomem *) MCFSIM_PADDR, | ||
| 36 | .podr = (void __iomem *) MCFSIM_PADAT, | ||
| 37 | .ppdr = (void __iomem *) MCFSIM_PADAT, | ||
| 38 | }, | ||
| 39 | { | ||
| 40 | .gpio_chip = { | ||
| 41 | .label = "PB", | ||
| 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 = 16, | ||
| 49 | .ngpio = 16, | ||
| 50 | }, | ||
| 51 | .pddr = (void __iomem *) MCFSIM_PBDDR, | ||
| 52 | .podr = (void __iomem *) MCFSIM_PBDAT, | ||
| 53 | .ppdr = (void __iomem *) MCFSIM_PBDAT, | ||
| 54 | }, | ||
| 55 | { | ||
| 56 | .gpio_chip = { | ||
| 57 | .label = "PC", | ||
| 58 | .request = mcf_gpio_request, | ||
| 59 | .free = mcf_gpio_free, | ||
| 60 | .direction_input = mcf_gpio_direction_input, | ||
| 61 | .direction_output = mcf_gpio_direction_output, | ||
| 62 | .get = mcf_gpio_get_value, | ||
| 63 | .set = mcf_gpio_set_value, | ||
| 64 | .base = 32, | ||
| 65 | .ngpio = 16, | ||
| 66 | }, | ||
| 67 | .pddr = (void __iomem *) MCFSIM_PCDDR, | ||
| 68 | .podr = (void __iomem *) MCFSIM_PCDAT, | ||
| 69 | .ppdr = (void __iomem *) MCFSIM_PCDAT, | ||
| 70 | }, | ||
| 71 | }; | 27 | }; |
| 72 | 28 | ||
| 73 | static int __init mcf_gpio_init(void) | 29 | static int __init mcf_gpio_init(void) |