5 files changed, 62 insertions, 50 deletions

diff --git a/include/linux/pinctrl/consumer.h b/include/linux/pinctrl/consumer.h
index 4aad3cea69ae..18eccefea06e 100644
--- a/include/linux/pinctrl/consumer.h
+++ b/include/linux/pinctrl/consumer.h
@@ -40,6 +40,25 @@ extern int pinctrl_select_state(struct pinctrl *p, struct pinctrl_state *s);
 extern struct pinctrl * __must_check devm_pinctrl_get(struct device *dev);
 extern void devm_pinctrl_put(struct pinctrl *p);
 
+#ifdef CONFIG_PM
+extern int pinctrl_pm_select_default_state(struct device *dev);
+extern int pinctrl_pm_select_sleep_state(struct device *dev);
+extern int pinctrl_pm_select_idle_state(struct device *dev);
+#else
+static inline int pinctrl_pm_select_default_state(struct device *dev)
+{
+        return 0;
+}
+static inline int pinctrl_pm_select_sleep_state(struct device *dev)
+{
+        return 0;
+}
+static inline int pinctrl_pm_select_idle_state(struct device *dev)
+{
+        return 0;
+}
+#endif
+
 #else /* !CONFIG_PINCTRL */
 
 static inline int pinctrl_request_gpio(unsigned gpio)
@@ -92,6 +111,21 @@ static inline void devm_pinctrl_put(struct pinctrl *p)
 {
 }
 
+static inline int pinctrl_pm_select_default_state(struct device *dev)
+{
+        return 0;
+}
+
+static inline int pinctrl_pm_select_sleep_state(struct device *dev)
+{
+        return 0;
+}
+
+static inline int pinctrl_pm_select_idle_state(struct device *dev)
+{
+        return 0;
+}
+
 #endif /* CONFIG_PINCTRL */
 
 static inline struct pinctrl * __must_check pinctrl_get_select(
@@ -158,47 +192,4 @@ static inline struct pinctrl * __must_check devm_pinctrl_get_select_default(
         return devm_pinctrl_get_select(dev, PINCTRL_STATE_DEFAULT);
 }
 
-#ifdef CONFIG_PINCONF
-
-extern int pin_config_get(const char *dev_name, const char *name,
-                          unsigned long *config);
-extern int pin_config_set(const char *dev_name, const char *name,
-                          unsigned long config);
-extern int pin_config_group_get(const char *dev_name,
-                                const char *pin_group,
-                                unsigned long *config);
-extern int pin_config_group_set(const char *dev_name,
-                                const char *pin_group,
-                                unsigned long config);
-
-#else
-
-static inline int pin_config_get(const char *dev_name, const char *name,
-                                 unsigned long *config)
-{
-        return 0;
-}
-
-static inline int pin_config_set(const char *dev_name, const char *name,
-                                 unsigned long config)
-{
-        return 0;
-}
-
-static inline int pin_config_group_get(const char *dev_name,
-                                       const char *pin_group,
-                                       unsigned long *config)
-{
-        return 0;
-}
-
-static inline int pin_config_group_set(const char *dev_name,
-                                       const char *pin_group,
-                                       unsigned long config)
-{
-        return 0;
-}
-
-#endif
-
 #endif /* __LINUX_PINCTRL_CONSUMER_H */
diff --git a/include/linux/pinctrl/devinfo.h b/include/linux/pinctrl/devinfo.h
index 6e5f8a985ea7..281cb91ddcf5 100644
--- a/include/linux/pinctrl/devinfo.h
+++ b/include/linux/pinctrl/devinfo.h
@@ -28,6 +28,10 @@
 struct dev_pin_info {
         struct pinctrl *p;
         struct pinctrl_state *default_state;
+#ifdef CONFIG_PM
+        struct pinctrl_state *sleep_state;
+        struct pinctrl_state *idle_state;
+#endif
 };
 
 extern int pinctrl_bind_pins(struct device *dev);
diff --git a/include/linux/pinctrl/pinconf-generic.h b/include/linux/pinctrl/pinconf-generic.h
index 6aa238096622..bf7e989abcb5 100644
--- a/include/linux/pinctrl/pinconf-generic.h
+++ b/include/linux/pinctrl/pinconf-generic.h
@@ -29,12 +29,25 @@
  *      if for example some other pin is going to drive the signal connected
  *      to it for a while. Pins used for input are usually always high
  *      impedance.
+ * @PIN_CONFIG_BIAS_BUS_HOLD: the pin will be set to weakly latch so that it
+ *      weakly drives the last value on a tristate bus, also known as a "bus
+ *      holder", "bus keeper" or "repeater". This allows another device on the
+ *      bus to change the value by driving the bus high or low and switching to
+ *      tristate. The argument is ignored.
  * @PIN_CONFIG_BIAS_PULL_UP: the pin will be pulled up (usually with high
  *      impedance to VDD). If the argument is != 0 pull-up is enabled,
- *      if it is 0, pull-up is disabled.
+ *      if it is 0, pull-up is total, i.e. the pin is connected to VDD.
  * @PIN_CONFIG_BIAS_PULL_DOWN: the pin will be pulled down (usually with high
  *      impedance to GROUND). If the argument is != 0 pull-down is enabled,
- *      if it is 0, pull-down is disabled.
+ *      if it is 0, pull-down is total, i.e. the pin is connected to GROUND.
+ * @PIN_CONFIG_BIAS_PULL_PIN_DEFAULT: the pin will be pulled up or down based
+ *      on embedded knowledge of the controller hardware, like current mux
+ *      function. The pull direction and possibly strength too will normally
+ *      be decided completely inside the hardware block and not be readable
+ *      from the kernel side.
+ *      If the argument is != 0 pull up/down is enabled, if it is 0, the
+ *      configuration is ignored. The proper way to disable it is to use
+ *      @PIN_CONFIG_BIAS_DISABLE.
  * @PIN_CONFIG_DRIVE_PUSH_PULL: the pin will be driven actively high and
  *      low, this is the most typical case and is typically achieved with two
  *      active transistors on the output. Setting this config will enable
@@ -57,14 +70,14 @@
  *      setting pins to this mode.
  * @PIN_CONFIG_INPUT_DEBOUNCE: this will configure the pin to debounce mode,
  *      which means it will wait for signals to settle when reading inputs. The
- *      argument gives the debounce time on a custom format. Setting the
+ *      argument gives the debounce time in usecs. Setting the
  *      argument to zero turns debouncing off.
  * @PIN_CONFIG_POWER_SOURCE: if the pin can select between different power
  *      supplies, the argument to this parameter (on a custom format) tells
  *      the driver which alternative power source to use.
  * @PIN_CONFIG_SLEW_RATE: if the pin can select slew rate, the argument to
- *      this parameter (on a custom format) tells the driver which alternative
- *      slew rate to use.
+ *      this parameter (on a custom format) tells the driver which alternative
+ *      slew rate to use.
  * @PIN_CONFIG_LOW_POWER_MODE: this will configure the pin for low power
  *      operation, if several modes of operation are supported these can be
  *      passed in the argument on a custom form, else just use argument 1
@@ -78,8 +91,10 @@
 enum pin_config_param {
         PIN_CONFIG_BIAS_DISABLE,
         PIN_CONFIG_BIAS_HIGH_IMPEDANCE,
+        PIN_CONFIG_BIAS_BUS_HOLD,
         PIN_CONFIG_BIAS_PULL_UP,
         PIN_CONFIG_BIAS_PULL_DOWN,
+        PIN_CONFIG_BIAS_PULL_PIN_DEFAULT,
         PIN_CONFIG_DRIVE_PUSH_PULL,
         PIN_CONFIG_DRIVE_OPEN_DRAIN,
         PIN_CONFIG_DRIVE_OPEN_SOURCE,
diff --git a/include/linux/pinctrl/pinconf.h b/include/linux/pinctrl/pinconf.h
index 1ad4f31ef6b8..f6998692bdc9 100644
--- a/include/linux/pinctrl/pinconf.h
+++ b/include/linux/pinctrl/pinconf.h
@@ -30,7 +30,7 @@ struct seq_file;
  * @pin_config_set: configure an individual pin
  * @pin_config_group_get: get configurations for an entire pin group
  * @pin_config_group_set: configure all pins in a group
- * @pin_config_group_dbg_set: optional debugfs to modify a pin configuration
+ * @pin_config_dbg_parse_modify: optional debugfs to modify a pin configuration
  * @pin_config_dbg_show: optional debugfs display hook that will provide
  *      per-device info for a certain pin in debugfs
  * @pin_config_group_dbg_show: optional debugfs display hook that will provide
diff --git a/include/linux/pinctrl/pinctrl.h b/include/linux/pinctrl/pinctrl.h
index 2c2a9e8d8578..5979147d2bda 100644
--- a/include/linux/pinctrl/pinctrl.h
+++ b/include/linux/pinctrl/pinctrl.h
@@ -49,7 +49,8 @@ struct pinctrl_pin_desc {
  * @name: a name for the chip in this range
  * @id: an ID number for the chip in this range
  * @base: base offset of the GPIO range
- * @pin_base: base pin number of the GPIO range
+ * @pin_base: base pin number of the GPIO range if pins == NULL
+ * @pins: enumeration of pins in GPIO range or NULL
  * @npins: number of pins in the GPIO range, including the base number
  * @gc: an optional pointer to a gpio_chip
  */
@@ -59,6 +60,7 @@ struct pinctrl_gpio_range {
         unsigned int id;
         unsigned int base;
         unsigned int pin_base;
+        unsigned const *pins;
         unsigned int npins;
         struct gpio_chip *gc;
 };