Commit 84f28fc3 authored by Thierry Reding's avatar Thierry Reding Committed by Linus Walleij

pinctrl: devicetree: Keep deferring even on timeout

driver_deferred_probe_check_state() may return -ETIMEDOUT instead of
-EPROBE_DEFER after all built-in drivers have been probed. This can
cause issues for built-in drivers that depend on resources provided by
loadable modules.

One such case happens on Tegra where I2C controllers are used during
early boot to set up the system PMIC, so the I2C driver needs to be a
built-in driver. At the same time, some instances of the I2C controller
depend on the DPAUX hardware for pinmuxing. Since the DPAUX is handled
by the display driver, which is usually not built-in, the pin control
states will not become available until after the root filesystem has
been mounted and the display driver loaded from it.

Fixes: bec6c0ec ("pinctrl: Remove use of driver_deferred_probe_check_state_continue()")
Suggested-by: default avatarJohn Stultz <john.stultz@linaro.org>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Link: https://lore.kernel.org/r/20200825143348.1358679-1-thierry.reding@gmail.comSigned-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 6d8e04f9
...@@ -130,9 +130,8 @@ static int dt_to_map_one_config(struct pinctrl *p, ...@@ -130,9 +130,8 @@ static int dt_to_map_one_config(struct pinctrl *p,
if (!np_pctldev || of_node_is_root(np_pctldev)) { if (!np_pctldev || of_node_is_root(np_pctldev)) {
of_node_put(np_pctldev); of_node_put(np_pctldev);
ret = driver_deferred_probe_check_state(p->dev); ret = driver_deferred_probe_check_state(p->dev);
/* keep deferring if modules are enabled unless we've timed out */ /* keep deferring if modules are enabled */
if (IS_ENABLED(CONFIG_MODULES) && !allow_default && if (IS_ENABLED(CONFIG_MODULES) && !allow_default && ret < 0)
(ret == -ENODEV))
ret = -EPROBE_DEFER; ret = -EPROBE_DEFER;
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment