From: Nicolas Ferre Date: Thu, 8 Dec 2011 14:35:22 +0000 (+0100) Subject: ARM: at91/gpio: remove the static specification of gpio_chip.base X-Git-Tag: MMI-PSA29.97-13-9~17153^2~10^2~14 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7530cd9246f1ff5c8ced20aaee3cb55eacb7d33c;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git ARM: at91/gpio: remove the static specification of gpio_chip.base This value is determined at runtime using device tree or platform data information. Signed-off-by: Nicolas Ferre Acked-by: Jean-Christophe PLAGNIOL-VILLARD --- diff --git a/arch/arm/mach-at91/gpio.c b/arch/arm/mach-at91/gpio.c index e8f5831e573d..ecf6bbb9103a 100644 --- a/arch/arm/mach-at91/gpio.c +++ b/arch/arm/mach-at91/gpio.c @@ -51,7 +51,7 @@ static int at91_gpiolib_direction_input(struct gpio_chip *chip, unsigned offset); static int at91_gpiolib_to_irq(struct gpio_chip *chip, unsigned offset); -#define AT91_GPIO_CHIP(name, base_gpio, nr_gpio) \ +#define AT91_GPIO_CHIP(name, nr_gpio) \ { \ .chip = { \ .label = name, \ @@ -60,18 +60,17 @@ static int at91_gpiolib_to_irq(struct gpio_chip *chip, unsigned offset); .get = at91_gpiolib_get, \ .set = at91_gpiolib_set, \ .dbg_show = at91_gpiolib_dbg_show, \ - .base = base_gpio, \ .to_irq = at91_gpiolib_to_irq, \ .ngpio = nr_gpio, \ }, \ } static struct at91_gpio_chip gpio_chip[] = { - AT91_GPIO_CHIP("pioA", 0x00, 32), - AT91_GPIO_CHIP("pioB", 0x20, 32), - AT91_GPIO_CHIP("pioC", 0x40, 32), - AT91_GPIO_CHIP("pioD", 0x60, 32), - AT91_GPIO_CHIP("pioE", 0x80, 32), + AT91_GPIO_CHIP("pioA", 32), + AT91_GPIO_CHIP("pioB", 32), + AT91_GPIO_CHIP("pioC", 32), + AT91_GPIO_CHIP("pioD", 32), + AT91_GPIO_CHIP("pioE", 32), }; static int gpio_banks;