From dc866fb8866cae8508d1c3a1c522047625dc69de Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Mon, 16 Apr 2012 16:12:43 +1000 Subject: [PATCH] --- yaml --- r: 302652 b: refs/heads/master c: 26b7c8270bb79908df07a7e2e68af6a6116505c9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/m68k/platform/5272/gpio.c | 50 ++-------------------------- 2 files changed, 4 insertions(+), 48 deletions(-) diff --git a/[refs] b/[refs] index efc1d30258bb..b7d94871fc24 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 56248926ecc1888b3273a09e5c50ffc389191f7e +refs/heads/master: 26b7c8270bb79908df07a7e2e68af6a6116505c9 diff --git a/trunk/arch/m68k/platform/5272/gpio.c b/trunk/arch/m68k/platform/5272/gpio.c index 57ac10a5d7f7..91358b830fc9 100644 --- a/trunk/arch/m68k/platform/5272/gpio.c +++ b/trunk/arch/m68k/platform/5272/gpio.c @@ -21,53 +21,9 @@ #include static struct mcf_gpio_chip mcf_gpio_chips[] = { - { - .gpio_chip = { - .label = "PA", - .request = mcf_gpio_request, - .free = mcf_gpio_free, - .direction_input = mcf_gpio_direction_input, - .direction_output = mcf_gpio_direction_output, - .get = mcf_gpio_get_value, - .set = mcf_gpio_set_value, - .ngpio = 16, - }, - .pddr = (void __iomem *) MCFSIM_PADDR, - .podr = (void __iomem *) MCFSIM_PADAT, - .ppdr = (void __iomem *) MCFSIM_PADAT, - }, - { - .gpio_chip = { - .label = "PB", - .request = mcf_gpio_request, - .free = mcf_gpio_free, - .direction_input = mcf_gpio_direction_input, - .direction_output = mcf_gpio_direction_output, - .get = mcf_gpio_get_value, - .set = mcf_gpio_set_value, - .base = 16, - .ngpio = 16, - }, - .pddr = (void __iomem *) MCFSIM_PBDDR, - .podr = (void __iomem *) MCFSIM_PBDAT, - .ppdr = (void __iomem *) MCFSIM_PBDAT, - }, - { - .gpio_chip = { - .label = "PC", - .request = mcf_gpio_request, - .free = mcf_gpio_free, - .direction_input = mcf_gpio_direction_input, - .direction_output = mcf_gpio_direction_output, - .get = mcf_gpio_get_value, - .set = mcf_gpio_set_value, - .base = 32, - .ngpio = 16, - }, - .pddr = (void __iomem *) MCFSIM_PCDDR, - .podr = (void __iomem *) MCFSIM_PCDAT, - .ppdr = (void __iomem *) MCFSIM_PCDAT, - }, + 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), }; static int __init mcf_gpio_init(void)