| Message ID | 20180213060814.18165-1-wens@csie.org |
|---|---|
| State | New |
| Headers | show |
| Series | gpio: Handle deferred probing in of_find_gpio() properly | expand |
On Tue, Feb 13, 2018 at 7:08 AM, Chen-Yu Tsai <wens@csie.org> wrote: > of_get_named_gpiod_flags() used directly in of_find_gpio() or indirectly > through of_find_spi_gpio() or of_find_regulator_gpio() can return > -EPROBE_DEFER. This gets overwritten by the subsequent of_find_*_gpio() > calls. > > This patch fixes this by trying of_find_spi_gpio() or > of_find_regulator_gpio() only if deferred probing was not requested by > the previous of_get_named_gpiod_flags() call. > > Fixes: 6a537d48461d ("gpio: of: Support regulator nonstandard GPIO properties") > Fixes: c85823390215 ("gpio: of: Support SPI nonstandard GPIO properties") > Signed-off-by: Chen-Yu Tsai <wens@csie.org> Patch applied, > /* Special handling for SPI GPIOs if used */ > - if (IS_ERR(desc)) > + if (IS_ERR(desc) && PTR_ERR(desc) != -EPROBE_DEFER) > desc = of_find_spi_gpio(dev, con_id, &of_flags); Dropped this hunk since Maxime's patch handles that. > /* Special handling for regulator GPIOs if used */ > - if (IS_ERR(desc)) > + if (IS_ERR(desc) && PTR_ERR(desc) != -EPROBE_DEFER) > desc = of_find_regulator_gpio(dev, con_id, &of_flags); Kept this. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c index 564bb7a31da4..edad176a210a 100644 --- a/drivers/gpio/gpiolib-of.c +++ b/drivers/gpio/gpiolib-of.c @@ -246,11 +246,11 @@ struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id, } /* Special handling for SPI GPIOs if used */ - if (IS_ERR(desc)) + if (IS_ERR(desc) && PTR_ERR(desc) != -EPROBE_DEFER) desc = of_find_spi_gpio(dev, con_id, &of_flags); /* Special handling for regulator GPIOs if used */ - if (IS_ERR(desc)) + if (IS_ERR(desc) && PTR_ERR(desc) != -EPROBE_DEFER) desc = of_find_regulator_gpio(dev, con_id, &of_flags); if (IS_ERR(desc))
of_get_named_gpiod_flags() used directly in of_find_gpio() or indirectly through of_find_spi_gpio() or of_find_regulator_gpio() can return -EPROBE_DEFER. This gets overwritten by the subsequent of_find_*_gpio() calls. This patch fixes this by trying of_find_spi_gpio() or of_find_regulator_gpio() only if deferred probing was not requested by the previous of_get_named_gpiod_flags() call. Fixes: 6a537d48461d ("gpio: of: Support regulator nonstandard GPIO properties") Fixes: c85823390215 ("gpio: of: Support SPI nonstandard GPIO properties") Signed-off-by: Chen-Yu Tsai <wens@csie.org> --- Hi Linus, Fresh fix for 4.16. I'm probably not the only one finding devices using gpios not working anymore. In my case it was pwrseq-mmc-simple probing before pinctrl/gpio, not being able to get the gpio, and then just consider the gpio missing instead of deferring. This in turn caused my SDIO WiFi to not work. --- drivers/gpio/gpiolib-of.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)