diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2012-04-10 04:00:38 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2012-04-18 07:53:11 -0400 |
commit | c05127c4e2c6e7d9949347a76fd05c337bcd5e84 (patch) | |
tree | 5b23f8a116919028317f026e3f9998dce2ffb828 /drivers/pinctrl/devicetree.c | |
parent | ad8bb720c23a80233e45ed31d67458f5e5b7ab31 (diff) |
pinctrl: implement pinctrl deferred probing
If drivers try to obtain pinctrl handles for a pin controller that
has not yet registered to the subsystem, we need to be able to
back out and retry with deferred probing. So let's return
-EPROBE_DEFER whenever this location fails. Also downgrade the
errors to info, maybe we will even set them to debug once the
deferred probing is commonplace.
Cc: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/devicetree.c')
-rw-r--r-- | drivers/pinctrl/devicetree.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pinctrl/devicetree.c b/drivers/pinctrl/devicetree.c index 5ef2feb44395..fcb1de45473c 100644 --- a/drivers/pinctrl/devicetree.c +++ b/drivers/pinctrl/devicetree.c | |||
@@ -121,11 +121,11 @@ static int dt_to_map_one_config(struct pinctrl *p, const char *statename, | |||
121 | for (;;) { | 121 | for (;;) { |
122 | np_pctldev = of_get_next_parent(np_pctldev); | 122 | np_pctldev = of_get_next_parent(np_pctldev); |
123 | if (!np_pctldev || of_node_is_root(np_pctldev)) { | 123 | if (!np_pctldev || of_node_is_root(np_pctldev)) { |
124 | dev_err(p->dev, "could not find pctldev for node %s\n", | 124 | dev_info(p->dev, "could not find pctldev for node %s, deferring probe\n", |
125 | np_config->full_name); | 125 | np_config->full_name); |
126 | of_node_put(np_pctldev); | 126 | of_node_put(np_pctldev); |
127 | /* FIXME: This should trigger deferrered probe */ | 127 | /* OK let's just assume this will appear later then */ |
128 | return -ENODEV; | 128 | return -EPROBE_DEFER; |
129 | } | 129 | } |
130 | pctldev = find_pinctrl_by_of_node(np_pctldev); | 130 | pctldev = find_pinctrl_by_of_node(np_pctldev); |
131 | if (pctldev) | 131 | if (pctldev) |