5 files changed, 65 insertions, 2 deletions

diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index be0eb4639128..a641cf3ccad6 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -322,6 +322,8 @@ static int really_probe(struct device *dev, struct device_driver *drv)
                         goto probe_failed;
         }
 
+        pinctrl_init_done(dev);
+
         if (dev->pm_domain && dev->pm_domain->sync)
                 dev->pm_domain->sync(dev);
 
diff --git a/drivers/base/pinctrl.c b/drivers/base/pinctrl.c
index 5fb74b43848e..076297592754 100644
--- a/drivers/base/pinctrl.c
+++ b/drivers/base/pinctrl.c
@@ -42,9 +42,20 @@ int pinctrl_bind_pins(struct device *dev)
                 goto cleanup_get;
         }
 
-        ret = pinctrl_select_state(dev->pins->p, dev->pins->default_state);
+        dev->pins->init_state = pinctrl_lookup_state(dev->pins->p,
+                                        PINCTRL_STATE_INIT);
+        if (IS_ERR(dev->pins->init_state)) {
+                /* Not supplying this state is perfectly legal */
+                dev_dbg(dev, "no init pinctrl state\n");
+
+                ret = pinctrl_select_state(dev->pins->p,
+                                           dev->pins->default_state);
+        } else {
+                ret = pinctrl_select_state(dev->pins->p, dev->pins->init_state);
+        }
+
         if (ret) {
-                dev_dbg(dev, "failed to activate default pinctrl state\n");
+                dev_dbg(dev, "failed to activate initial pinctrl state\n");
                 goto cleanup_get;
         }
 
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index 9638a00c67c2..2686a4450dfc 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -1240,6 +1240,38 @@ int pinctrl_force_default(struct pinctrl_dev *pctldev)
 }
 EXPORT_SYMBOL_GPL(pinctrl_force_default);
 
+/**
+ * pinctrl_init_done() - tell pinctrl probe is done
+ *
+ * We'll use this time to switch the pins from "init" to "default" unless the
+ * driver selected some other state.
+ *
+ * @dev: device to that's done probing
+ */
+int pinctrl_init_done(struct device *dev)
+{
+        struct dev_pin_info *pins = dev->pins;
+        int ret;
+
+        if (!pins)
+                return 0;
+
+        if (IS_ERR(pins->init_state))
+                return 0; /* No such state */
+
+        if (pins->p->state != pins->init_state)
+                return 0; /* Not at init anyway */
+
+        if (IS_ERR(pins->default_state))
+                return 0; /* No default state */
+
+        ret = pinctrl_select_state(pins->p, pins->default_state);
+        if (ret)
+                dev_err(dev, "failed to activate default pinctrl state\n");
+
+        return ret;
+}
+
 #ifdef CONFIG_PM
 
 /**
diff --git a/include/linux/pinctrl/devinfo.h b/include/linux/pinctrl/devinfo.h
index 281cb91ddcf5..05082e407c4a 100644
--- a/include/linux/pinctrl/devinfo.h
+++ b/include/linux/pinctrl/devinfo.h
@@ -24,10 +24,14 @@
  * struct dev_pin_info - pin state container for devices
  * @p: pinctrl handle for the containing device
  * @default_state: the default state for the handle, if found
+ * @init_state: the state at probe time, if found
+ * @sleep_state: the state at suspend time, if found
+ * @idle_state: the state at idle (runtime suspend) time, if found
  */
 struct dev_pin_info {
         struct pinctrl *p;
         struct pinctrl_state *default_state;
+        struct pinctrl_state *init_state;
 #ifdef CONFIG_PM
         struct pinctrl_state *sleep_state;
         struct pinctrl_state *idle_state;
@@ -35,6 +39,7 @@ struct dev_pin_info {
 };
 
 extern int pinctrl_bind_pins(struct device *dev);
+extern int pinctrl_init_done(struct device *dev);
 
 #else
 
@@ -45,5 +50,10 @@ static inline int pinctrl_bind_pins(struct device *dev)
         return 0;
 }
 
+static inline int pinctrl_init_done(struct device *dev)
+{
+        return 0;
+}
+
 #endif /* CONFIG_PINCTRL */
 #endif /* PINCTRL_DEVINFO_H */
diff --git a/include/linux/pinctrl/pinctrl-state.h b/include/linux/pinctrl/pinctrl-state.h
index b5919f8e6d1a..23073519339f 100644
--- a/include/linux/pinctrl/pinctrl-state.h
+++ b/include/linux/pinctrl/pinctrl-state.h
@@ -9,6 +9,13 @@
  *      hogs to configure muxing and pins at boot, and also as a state
  *      to go into when returning from sleep and idle in
  *      .pm_runtime_resume() or ordinary .resume() for example.
+ * @PINCTRL_STATE_INIT: normally the pinctrl will be set to "default"
+ *      before the driver's probe() function is called.  There are some
+ *      drivers where that is not appropriate becausing doing so would
+ *      glitch the pins.  In those cases you can add an "init" pinctrl
+ *      which is the state of the pins before drive probe.  After probe
+ *      if the pins are still in "init" state they'll be moved to
+ *      "default".
  * @PINCTRL_STATE_IDLE: the state the pinctrl handle shall be put into
  *      when the pins are idle. This is a state where the system is relaxed
  *      but not fully sleeping - some power may be on but clocks gated for
@@ -20,5 +27,6 @@
  *      ordinary .suspend() function.
  */
 #define PINCTRL_STATE_DEFAULT "default"
+#define PINCTRL_STATE_INIT "init"
 #define PINCTRL_STATE_IDLE "idle"
 #define PINCTRL_STATE_SLEEP "sleep"