From 968519eb8f9df1ba52e29c78fbe478d096e531a6 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Mon, 16 Apr 2012 16:11:11 +1000 Subject: [PATCH] --- yaml --- r: 302651 b: refs/heads/master c: 56248926ecc1888b3273a09e5c50ffc389191f7e h: refs/heads/master i: 302649: bd61a86f847a9f589919ba4eaca650eb7412389b 302647: 1a38689a04e0112cd226c4c407fe6569ea50241f v: v3 --- [refs] | 2 +- trunk/arch/m68k/platform/5249/gpio.c | 33 ++-------------------------- 2 files changed, 3 insertions(+), 32 deletions(-) diff --git a/[refs] b/[refs] index c30136ac8570..efc1d30258bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32ec63508939e0605fc057ecdd062f307e86f5b2 +refs/heads/master: 56248926ecc1888b3273a09e5c50ffc389191f7e diff --git a/trunk/arch/m68k/platform/5249/gpio.c b/trunk/arch/m68k/platform/5249/gpio.c index 2b56c6ef65bf..775d618b9a44 100644 --- a/trunk/arch/m68k/platform/5249/gpio.c +++ b/trunk/arch/m68k/platform/5249/gpio.c @@ -21,37 +21,8 @@ #include static struct mcf_gpio_chip mcf_gpio_chips[] = { - { - .gpio_chip = { - .label = "GPIO0", - .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 = 32, - }, - .pddr = (void __iomem *) MCFSIM2_GPIOENABLE, - .podr = (void __iomem *) MCFSIM2_GPIOWRITE, - .ppdr = (void __iomem *) MCFSIM2_GPIOREAD, - }, - { - .gpio_chip = { - .label = "GPIO1", - .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 = 32, - }, - .pddr = (void __iomem *) MCFSIM2_GPIO1ENABLE, - .podr = (void __iomem *) MCFSIM2_GPIO1WRITE, - .ppdr = (void __iomem *) MCFSIM2_GPIO1READ, - }, + MCFGPS(GPIO0, 0, 32, MCFSIM2_GPIOENABLE, MCFSIM2_GPIOWRITE, MCFSIM2_GPIOREAD), + MCFGPS(GPIO1, 32, 32, MCFSIM2_GPIO1ENABLE, MCFSIM2_GPIO1WRITE, MCFSIM2_GPIO1READ), }; static int __init mcf_gpio_init(void)