pinctrl: Pass all configs to driver on pin_config_set()

When setting pin configuration in the pinctrl framework, pin_config_set() or
pin_config_group_set() is called in a loop to set one configuration at a time
for the specified pin or group.

This patch 1) removes the loop and 2) changes the API to pass the whole pin
config array to the driver.  It is now up to the driver to loop through the
configs.  This allows the driver to potentially combine configs and reduce the
number of writes to pin config registers.

All c files changed have been build-tested to verify the change compiles and
that the corresponding .o is successfully generated.

Signed-off-by: Sherman Yin <syin@broadcom.com>
Reviewed-by: Christian Daudt <csd@broadcom.com>
Reviewed-by: Matt Porter <matt.porter@linaro.org>
Tested-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

1 files changed, 102 insertions, 85 deletions

diff --git a/drivers/pinctrl/pinctrl-abx500.c b/drivers/pinctrl/pinctrl-abx500.c
index 1d3f988c2c8b..8f25df06bc6b 100644
--- a/drivers/pinctrl/pinctrl-abx500.c
+++ b/drivers/pinctrl/pinctrl-abx500.c
@@ -1041,98 +1041,115 @@ static int abx500_pin_config_get(struct pinctrl_dev *pctldev,
 
 static int abx500_pin_config_set(struct pinctrl_dev *pctldev,
                           unsigned pin,
-                          unsigned long config)
+                          unsigned long *configs,
+                          unsigned num_configs)
 {
         struct abx500_pinctrl *pct = pinctrl_dev_get_drvdata(pctldev);
         struct gpio_chip *chip = &pct->chip;
         unsigned offset;
         int ret = -EINVAL;
-        enum pin_config_param param = pinconf_to_config_param(config);
-        enum pin_config_param argument = pinconf_to_config_argument(config);
-
-        dev_dbg(chip->dev, "pin %d [%#lx]: %s %s\n",
-                pin, config, (param == PIN_CONFIG_OUTPUT) ? "output " : "input",
-                (param == PIN_CONFIG_OUTPUT) ? (argument ? "high" : "low") :
-                (argument ? "pull up" : "pull down"));
-
-        /* on ABx500, there is no GPIO0, so adjust the offset */
-        offset = pin - 1;
-
-        switch (param) {
-        case PIN_CONFIG_BIAS_DISABLE:
-                ret = abx500_gpio_direction_input(chip, offset);
-                if (ret < 0)
-                        goto out;
-                /*
-                 * Some chips only support pull down, while some actually
-                 * support both pull up and pull down. Such chips have
-                 * a "pullud" range specified for the pins that support
-                 * both features. If the pin is not within that range, we
-                 * fall back to the old bit set that only support pull down.
-                 */
-                if (abx500_pullud_supported(chip, pin))
-                        ret = abx500_set_pull_updown(pct,
-                                pin,
-                                ABX500_GPIO_PULL_NONE);
-                else
-                        /* Chip only supports pull down */
-                        ret = abx500_gpio_set_bits(chip, AB8500_GPIO_PUD1_REG,
-                                offset, ABX500_GPIO_PULL_NONE);
-                break;
-
-        case PIN_CONFIG_BIAS_PULL_DOWN:
-                ret = abx500_gpio_direction_input(chip, offset);
-                if (ret < 0)
-                        goto out;
-                /*
-                 * if argument = 1 set the pull down
-                 * else clear the pull down
-                 * Some chips only support pull down, while some actually
-                 * support both pull up and pull down. Such chips have
-                 * a "pullud" range specified for the pins that support
-                 * both features. If the pin is not within that range, we
-                 * fall back to the old bit set that only support pull down.
-                 */
-                if (abx500_pullud_supported(chip, pin))
-                        ret = abx500_set_pull_updown(pct,
-                                pin,
-                                argument ? ABX500_GPIO_PULL_DOWN : ABX500_GPIO_PULL_NONE);
-                else
-                        /* Chip only supports pull down */
-                        ret = abx500_gpio_set_bits(chip, AB8500_GPIO_PUD1_REG,
-                                offset,
-                                argument ? ABX500_GPIO_PULL_DOWN : ABX500_GPIO_PULL_NONE);
-                break;
-
-        case PIN_CONFIG_BIAS_PULL_UP:
-                ret = abx500_gpio_direction_input(chip, offset);
-                if (ret < 0)
-                        goto out;
-                /*
-                 * if argument = 1 set the pull up
-                 * else clear the pull up
-                 */
-                ret = abx500_gpio_direction_input(chip, offset);
-                /*
-                 * Some chips only support pull down, while some actually
-                 * support both pull up and pull down. Such chips have
-                 * a "pullud" range specified for the pins that support
-                 * both features. If the pin is not within that range, do
-                 * nothing
-                 */
-                if (abx500_pullud_supported(chip, pin))
-                        ret = abx500_set_pull_updown(pct,
-                                pin,
-                                argument ? ABX500_GPIO_PULL_UP : ABX500_GPIO_PULL_NONE);
-                break;
+        int i;
+        enum pin_config_param param;
+        enum pin_config_param argument;
+
+        for (i = 0; i < num_configs; i++) {
+                param = pinconf_to_config_param(configs[i]);
+                argument = pinconf_to_config_argument(configs[i]);
+
+                dev_dbg(chip->dev, "pin %d [%#lx]: %s %s\n",
+                        pin, configs[i],
+                        (param == PIN_CONFIG_OUTPUT) ? "output " : "input",
+                        (param == PIN_CONFIG_OUTPUT) ?
+                        (argument ? "high" : "low") :
+                        (argument ? "pull up" : "pull down"));
+
+                /* on ABx500, there is no GPIO0, so adjust the offset */
+                offset = pin - 1;
+
+                switch (param) {
+                case PIN_CONFIG_BIAS_DISABLE:
+                        ret = abx500_gpio_direction_input(chip, offset);
+                        if (ret < 0)
+                                goto out;
+                        /*
+                         * Some chips only support pull down, while some
+                         * actually support both pull up and pull down. Such
+                         * chips have a "pullud" range specified for the pins
+                         * that support both features. If the pin is not
+                         * within that range, we fall back to the old bit set
+                         * that only support pull down.
+                         */
+                        if (abx500_pullud_supported(chip, pin))
+                                ret = abx500_set_pull_updown(pct,
+                                        pin,
+                                        ABX500_GPIO_PULL_NONE);
+                        else
+                                /* Chip only supports pull down */
+                                ret = abx500_gpio_set_bits(chip,
+                                        AB8500_GPIO_PUD1_REG, offset,
+                                        ABX500_GPIO_PULL_NONE);
+                        break;
 
-        case PIN_CONFIG_OUTPUT:
-                ret = abx500_gpio_direction_output(chip, offset, argument);
-                break;
+                case PIN_CONFIG_BIAS_PULL_DOWN:
+                        ret = abx500_gpio_direction_input(chip, offset);
+                        if (ret < 0)
+                                goto out;
+                        /*
+                         * if argument = 1 set the pull down
+                         * else clear the pull down
+                         * Some chips only support pull down, while some
+                         * actually support both pull up and pull down. Such
+                         * chips have a "pullud" range specified for the pins
+                         * that support both features. If the pin is not
+                         * within that range, we fall back to the old bit set
+                         * that only support pull down.
+                         */
+                        if (abx500_pullud_supported(chip, pin))
+                                ret = abx500_set_pull_updown(pct,
+                                        pin,
+                                        argument ? ABX500_GPIO_PULL_DOWN :
+                                        ABX500_GPIO_PULL_NONE);
+                        else
+                                /* Chip only supports pull down */
+                                ret = abx500_gpio_set_bits(chip,
+                                AB8500_GPIO_PUD1_REG,
+                                        offset,
+                                        argument ? ABX500_GPIO_PULL_DOWN :
+                                        ABX500_GPIO_PULL_NONE);
+                        break;
 
-        default:
-                dev_err(chip->dev, "illegal configuration requested\n");
-        }
+                case PIN_CONFIG_BIAS_PULL_UP:
+                        ret = abx500_gpio_direction_input(chip, offset);
+                        if (ret < 0)
+                                goto out;
+                        /*
+                         * if argument = 1 set the pull up
+                         * else clear the pull up
+                         */
+                        ret = abx500_gpio_direction_input(chip, offset);
+                        /*
+                         * Some chips only support pull down, while some
+                         * actually support both pull up and pull down. Such
+                         * chips have a "pullud" range specified for the pins
+                         * that support both features. If the pin is not
+                         * within that range, do nothing
+                         */
+                        if (abx500_pullud_supported(chip, pin))
+                                ret = abx500_set_pull_updown(pct,
+                                        pin,
+                                        argument ? ABX500_GPIO_PULL_UP :
+                                        ABX500_GPIO_PULL_NONE);
+                        break;
+
+                case PIN_CONFIG_OUTPUT:
+                        ret = abx500_gpio_direction_output(chip, offset,
+                                argument);
+                        break;
+
+                default:
+                        dev_err(chip->dev, "illegal configuration requested\n");
+                }
+        } /* for each config */
 out:
         if (ret < 0)
                 dev_err(pct->dev, "%s failed (%d)\n", __func__, ret);