2 files changed, 18 insertions, 0 deletions

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"