From mboxrd@z Thu Jan 1 00:00:00 1970 From: nicolas.ferre@atmel.com (Nicolas Ferre) Date: Tue, 7 Aug 2012 14:52:35 +0200 Subject: [PATCH 4/4] arm: at91: at91sam9x5: fix gpio number per bank In-Reply-To: <1342359637-15325-4-git-send-email-plagnioj@jcrosoft.com> References: <20120715131618.GF4450@game.jcrosoft.org> <1342359637-15325-1-git-send-email-plagnioj@jcrosoft.com> <1342359637-15325-4-git-send-email-plagnioj@jcrosoft.com> Message-ID: <50210F93.8010003@atmel.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 07/15/2012 03:40 PM, Jean-Christophe PLAGNIOL-VILLARD : > On the serie 5 bank b and d have 19 and 22 pins only. No, it is not understandable. > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD > --- > .../devicetree/bindings/gpio/gpio_atmel.txt | 5 +++ > arch/arm/boot/dts/at91sam9x5.dtsi | 2 ++ > arch/arm/mach-at91/gpio.c | 33 +++++++++++++------- > 3 files changed, 29 insertions(+), 11 deletions(-) > > diff --git a/Documentation/devicetree/bindings/gpio/gpio_atmel.txt b/Documentation/devicetree/bindings/gpio/gpio_atmel.txt > index 66efc80..d8dd425 100644 > --- a/Documentation/devicetree/bindings/gpio/gpio_atmel.txt > +++ b/Documentation/devicetree/bindings/gpio/gpio_atmel.txt > @@ -9,6 +9,10 @@ Required properties: > unused). > - gpio-controller: Marks the device node as a GPIO controller. > > +optional properties: > +- gpio-nb: Number of gpio if absent 32. Cf. Olof's comments. > + > + > Example: > pioA: gpio at fffff200 { > compatible = "atmel,at91rm9200-gpio"; > @@ -16,5 +20,6 @@ Example: > interrupts = <2 4>; > #gpio-cells = <2>; > gpio-controller; > + gpio-nb = <32>; No need: 32 is the default. > }; > > diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi > index e25c8d0..e4d785b 100644 > --- a/arch/arm/boot/dts/at91sam9x5.dtsi > +++ b/arch/arm/boot/dts/at91sam9x5.dtsi > @@ -132,6 +132,7 @@ > interrupts = <2 4>; > #gpio-cells = <2>; > gpio-controller; > + gpio-nb = <19>; > interrupt-controller; > }; > > @@ -150,6 +151,7 @@ > interrupts = <3 4>; > #gpio-cells = <2>; > gpio-controller; > + gpio-nb = <22>; > interrupt-controller; > }; > }; > diff --git a/arch/arm/mach-at91/gpio.c b/arch/arm/mach-at91/gpio.c > index 3833f82..1ab06e8 100644 > --- a/arch/arm/mach-at91/gpio.c > +++ b/arch/arm/mach-at91/gpio.c > @@ -31,6 +31,8 @@ > > #include "generic.h" > > +#define MAX_NB_GPIO_PER_BANK 32 > + > struct at91_gpio_chip { > struct gpio_chip chip; > struct at91_gpio_chip *next; /* Bank sharing same clock */ > @@ -55,7 +57,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, nr_gpio) \ > +#define AT91_GPIO_CHIP(name) \ > { \ > .chip = { \ > .label = name, \ > @@ -67,16 +69,16 @@ static int at91_gpiolib_to_irq(struct gpio_chip *chip, unsigned offset); > .set = at91_gpiolib_set, \ > .dbg_show = at91_gpiolib_dbg_show, \ > .to_irq = at91_gpiolib_to_irq, \ > - .ngpio = nr_gpio, \ > + .ngpio = MAX_NB_GPIO_PER_BANK, \ > }, \ > } > > static struct at91_gpio_chip gpio_chip[] = { > - 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), > + AT91_GPIO_CHIP("pioA"), > + AT91_GPIO_CHIP("pioB"), > + AT91_GPIO_CHIP("pioC"), > + AT91_GPIO_CHIP("pioD"), > + AT91_GPIO_CHIP("pioE"), > }; > > static int gpio_banks; > @@ -91,7 +93,7 @@ static unsigned long at91_gpio_caps; > > static inline void __iomem *pin_to_controller(unsigned pin) > { > - pin /= 32; > + pin /= MAX_NB_GPIO_PER_BANK; > if (likely(pin < gpio_banks)) > return gpio_chip[pin].regbase; > > @@ -100,7 +102,7 @@ static inline void __iomem *pin_to_controller(unsigned pin) > > static inline unsigned pin_to_mask(unsigned pin) > { > - return 1 << (pin % 32); > + return 1 << (pin % MAX_NB_GPIO_PER_BANK); > } > > > @@ -998,6 +1000,7 @@ static void __init of_at91_gpio_init_one(struct device_node *np) > { > int alias_idx; > struct at91_gpio_chip *at91_gpio; > + uint32_t ngpio; > > if (!np) > return; > @@ -1010,7 +1013,7 @@ static void __init of_at91_gpio_init_one(struct device_node *np) > } > > at91_gpio = &gpio_chip[alias_idx]; > - at91_gpio->chip.base = alias_idx * at91_gpio->chip.ngpio; > + at91_gpio->chip.base = alias_idx * MAX_NB_GPIO_PER_BANK; > > at91_gpio->regbase = of_iomap(np, 0); > if (!at91_gpio->regbase) { > @@ -1030,6 +1033,14 @@ static void __init of_at91_gpio_init_one(struct device_node *np) > if (of_device_is_compatible(np, "atmel,at91sam9x5-gpio")) > at91_gpio_caps |= AT91_GPIO_CAP_PIO3; > > + if (!of_property_read_u32(np, "gpio-nb", &ngpio)) { > + if (ngpio >= MAX_NB_GPIO_PER_BANK) > + pr_err("at91_gpio.%d, gpio-nb >= %d failback to %d\n", > + alias_idx, MAX_NB_GPIO_PER_BANK, MAX_NB_GPIO_PER_BANK); > + else > + at91_gpio->chip.ngpio = ngpio; > + } > + > /* Setup clock */ > if (at91_gpio_setup_clk(alias_idx)) > goto ioremap_err; > @@ -1067,7 +1078,7 @@ static void __init at91_gpio_init_one(int idx, u32 regbase, int pioc_hwirq) > { > struct at91_gpio_chip *at91_gpio = &gpio_chip[idx]; > > - at91_gpio->chip.base = idx * at91_gpio->chip.ngpio; > + at91_gpio->chip.base = idx * MAX_NB_GPIO_PER_BANK; > at91_gpio->pioc_hwirq = pioc_hwirq; > at91_gpio->pioc_idx = idx; Otherwise, I like it: so please resend it with corrections. Bye, -- Nicolas Ferre