pinctrl: API changes to support multiple states per device

The API model is changed from:

p = pinctrl_get(dev, "state1");
pinctrl_enable(p);
...
pinctrl_disable(p);
pinctrl_put(p);
p = pinctrl_get(dev, "state2");
pinctrl_enable(p);
...
pinctrl_disable(p);
pinctrl_put(p);

to this:

p = pinctrl_get(dev);
s1 = pinctrl_lookup_state(p, "state1");
s2 = pinctrl_lookup_state(p, "state2");
pinctrl_select_state(p, s1);
...
pinctrl_select_state(p, s2);
...
pinctrl_put(p);

This allows devices to directly transition between states without
disabling the pin controller programming and put()/get()ing the
configuration data each time. This model will also better suit pinconf
programming, which doesn't have a concept of "disable".

The special-case hogging feature of pin controllers is re-written to use
the regular APIs instead of special-case code. Hence, the pinmux-hogs
debugfs file is removed; see the top-level pinctrl-handles files for
equivalent data.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Dong Aisheng <dong.aisheng@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

1 files changed, 5 insertions, 6 deletions

diff --git a/include/linux/pinctrl/machine.h b/include/linux/pinctrl/machine.h
index 20e97353d5f9..05d25c8adbaf 100644
--- a/include/linux/pinctrl/machine.h
+++ b/include/linux/pinctrl/machine.h
@@ -21,23 +21,22 @@
  *      same name as the pin controllers own dev_name(), the map entry will be
  *      hogged by the driver itself upon registration
  * @name: the name of this specific map entry for the particular machine.
- *      This is the second parameter passed to pinmux_get() when you want
- *      to have several mappings to the same device
+ *      This is the parameter passed to pinmux_lookup_state()
  * @ctrl_dev_name: the name of the device controlling this specific mapping,
  *      the name must be the same as in your struct device*
- * @function: a function in the driver to use for this mapping, the driver
- *      will lookup the function referenced by this ID on the specified
- *      pin control device
  * @group: sometimes a function can map to different pin groups, so this
  *      selects a certain specific pin group to activate for the function, if
  *      left as NULL, the first applicable group will be used
+ * @function: a function in the driver to use for this mapping, the driver
+ *      will lookup the function referenced by this ID on the specified
+ *      pin control device
  */
 struct pinctrl_map {
         const char *dev_name;
         const char *name;
         const char *ctrl_dev_name;
-        const char *function;
         const char *group;
+        const char *function;
 };
 
 /*