On 09/03/2015 08:31 PM, Tony Lindgren wrote:
If gpio-omap probe fails with -EPROBE_DEFER, the GPIO numbering keeps increasing. Only increase the gpio count if gpiochip_add() was successful as otherwise the numbers will increase for each probe attempt.Cc: Grygorii Strashko <grygorii.stras...@ti.com> Cc: Javier Martinez Canillas <jav...@dowhile0.org> Cc: Kevin Hilman <khil...@deeprootsystems.com> Cc: Santosh Shilimkar <ssant...@kernel.org> Signed-off-by: Tony Lindgren <t...@atomide.com> --- drivers/gpio/gpio-omap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/gpio/gpio-omap.c +++ b/drivers/gpio/gpio-omap.c @@ -1095,7 +1095,6 @@ static int omap_gpio_chip_init(struct gpio_bank *bank, struct irq_chip *irqc) } else { bank->chip.label = "gpio"; bank->chip.base = gpio; - gpio += bank->width; } bank->chip.ngpio = bank->width; @@ -1105,6 +1104,9 @@ static int omap_gpio_chip_init(struct gpio_bank *bank, struct irq_chip *irqc) return ret; } + if (!bank->is_mpuio) + gpio += bank->width; + #ifdef CONFIG_ARCH_OMAP1 /* * REVISIT: Once we have OMAP1 supporting SPARSE_IRQ, we can drop
Reviewed-by: Grygorii Strashko <grygorii.stras...@ti.com> With hope that only GPIO0 will be deferred, otherwise there will be total mess in gpios enumeration ;) -- regards, -grygorii -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
