From e0e140c0c727255193a9adbb197e8480a2051183 Mon Sep 17 00:00:00 2001
From: Linus Walleij <linus.walleij@linaro.org>
Date: Tue, 10 Apr 2012 10:00:38 +0200
Subject: [PATCH] --- yaml --- r: 302335 b: refs/heads/master c:
 c05127c4e2c6e7d9949347a76fd05c337bcd5e84 h: refs/heads/master i:   302333:
 25fcd53512ac2ec0f80cd463cfc647e52a7a5a3b   302331:
 c109d2c88f73316715139f76ad720b797601cca9   302327:
 5c7f4e29d71ebe56d4ee0e123a0f0a2584ab61d8   302319:
 9974518cb084cd47947eaf323235d4a6b9914173   302303:
 b7e94960ef1ebcbad6121c28e12bbd2ce1c3a7b9   302271:
 c074861dfad2a8fc4da1c194deaa21bdcf5da2a3   302207:
 66c22af1921ad0cac19e29971de528fb3a4c6e96   302079:
 efcea516635255e6beecec5423d8abc36a23fe79 v: v3

---
 [refs]                             | 2 +-
 trunk/Documentation/pinctrl.txt    | 5 +++++
 trunk/drivers/pinctrl/core.c       | 9 ++++++---
 trunk/drivers/pinctrl/devicetree.c | 6 +++---
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 8d3836641c1d..5a5e52d69d8f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad8bb720c23a80233e45ed31d67458f5e5b7ab31
+refs/heads/master: c05127c4e2c6e7d9949347a76fd05c337bcd5e84
diff --git a/trunk/Documentation/pinctrl.txt b/trunk/Documentation/pinctrl.txt
index eb46b1c0b07a..4431c3e727ba 100644
--- a/trunk/Documentation/pinctrl.txt
+++ b/trunk/Documentation/pinctrl.txt
@@ -1043,6 +1043,11 @@ quickly poking some registers.
 The pins are allocated for your device when you issue the pinctrl_get() call,
 after this you should be able to see this in the debugfs listing of all pins.
 
+NOTE: the pinctrl system will return -EPROBE_DEFER if it cannot find the
+requested pinctrl handles, for example if the pinctrl driver has not yet
+registered. Thus make sure that the error path in your driver gracefully
+cleans up and is ready to retry the probing later in the startup process.
+
 
 System pin control hogging
 ==========================
diff --git a/trunk/drivers/pinctrl/core.c b/trunk/drivers/pinctrl/core.c
index 7ff869007ba4..59027ab8347a 100644
--- a/trunk/drivers/pinctrl/core.c
+++ b/trunk/drivers/pinctrl/core.c
@@ -518,11 +518,14 @@ static int add_setting(struct pinctrl *p, struct pinctrl_map const *map)
 
 	setting->pctldev = get_pinctrl_dev_from_devname(map->ctrl_dev_name);
 	if (setting->pctldev == NULL) {
-		dev_err(p->dev, "unknown pinctrl device %s in map entry",
+		dev_info(p->dev, "unknown pinctrl device %s in map entry, deferring probe",
 			map->ctrl_dev_name);
 		kfree(setting);
-		/* Eventually, this should trigger deferred probe */
-		return -ENODEV;
+		/*
+		 * OK let us guess that the driver is not there yet, and
+		 * let's defer obtaining this pinctrl handle to later...
+		 */
+		return -EPROBE_DEFER;
 	}
 
 	switch (map->type) {
diff --git a/trunk/drivers/pinctrl/devicetree.c b/trunk/drivers/pinctrl/devicetree.c
index 5ef2feb44395..fcb1de45473c 100644
--- a/trunk/drivers/pinctrl/devicetree.c
+++ b/trunk/drivers/pinctrl/devicetree.c
@@ -121,11 +121,11 @@ static int dt_to_map_one_config(struct pinctrl *p, const char *statename,
 	for (;;) {
 		np_pctldev = of_get_next_parent(np_pctldev);
 		if (!np_pctldev || of_node_is_root(np_pctldev)) {
-			dev_err(p->dev, "could not find pctldev for node %s\n",
+			dev_info(p->dev, "could not find pctldev for node %s, deferring probe\n",
 				np_config->full_name);
 			of_node_put(np_pctldev);
-			/* FIXME: This should trigger deferrered probe */
-			return -ENODEV;
+			/* OK let's just assume this will appear later then */
+			return -EPROBE_DEFER;
 		}
 		pctldev = find_pinctrl_by_of_node(np_pctldev);
 		if (pctldev)