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, 30 insertions, 24 deletions

diff --git a/drivers/pinctrl/vt8500/pinctrl-wmt.c b/drivers/pinctrl/vt8500/pinctrl-wmt.c
index 0cc4335bc0f2..39aec0850810 100644
--- a/drivers/pinctrl/vt8500/pinctrl-wmt.c
+++ b/drivers/pinctrl/vt8500/pinctrl-wmt.c
@@ -424,15 +424,16 @@ static int wmt_pinconf_get(struct pinctrl_dev *pctldev, unsigned pin,
 }
 
 static int wmt_pinconf_set(struct pinctrl_dev *pctldev, unsigned pin,
-                           unsigned long config)
+                           unsigned long *configs, unsigned num_configs)
 {
         struct wmt_pinctrl_data *data = pinctrl_dev_get_drvdata(pctldev);
-        enum pin_config_param param = pinconf_to_config_param(config);
-        u16 arg = pinconf_to_config_argument(config);
+        enum pin_config_param param;
+        u16 arg;
         u32 bank = WMT_BANK_FROM_PIN(pin);
         u32 bit = WMT_BIT_FROM_PIN(pin);
         u32 reg_pull_en = data->banks[bank].reg_pull_en;
         u32 reg_pull_cfg = data->banks[bank].reg_pull_cfg;
+        int i;
 
         if ((reg_pull_en == NO_REG) || (reg_pull_cfg == NO_REG)) {
                 dev_err(data->dev, "bias functions not supported on pin %d\n",
@@ -440,28 +441,33 @@ static int wmt_pinconf_set(struct pinctrl_dev *pctldev, unsigned pin,
                 return -EINVAL;
         }
 
-        if ((param == PIN_CONFIG_BIAS_PULL_DOWN) ||
-            (param == PIN_CONFIG_BIAS_PULL_UP)) {
-                if (arg == 0)
-                        param = PIN_CONFIG_BIAS_DISABLE;
-        }
+        for (i = 0; i < num_configs; i++) {
+                param = pinconf_to_config_param(configs[i]);
+                arg = pinconf_to_config_argument(configs[i]);
 
-        switch (param) {
-        case PIN_CONFIG_BIAS_DISABLE:
-                wmt_clearbits(data, reg_pull_en, BIT(bit));
-                break;
-        case PIN_CONFIG_BIAS_PULL_DOWN:
-                wmt_clearbits(data, reg_pull_cfg, BIT(bit));
-                wmt_setbits(data, reg_pull_en, BIT(bit));
-                break;
-        case PIN_CONFIG_BIAS_PULL_UP:
-                wmt_setbits(data, reg_pull_cfg, BIT(bit));
-                wmt_setbits(data, reg_pull_en, BIT(bit));
-                break;
-        default:
-                dev_err(data->dev, "unknown pinconf param\n");
-                return -EINVAL;
-        }
+                if ((param == PIN_CONFIG_BIAS_PULL_DOWN) ||
+                    (param == PIN_CONFIG_BIAS_PULL_UP)) {
+                        if (arg == 0)
+                                param = PIN_CONFIG_BIAS_DISABLE;
+                }
+
+                switch (param) {
+                case PIN_CONFIG_BIAS_DISABLE:
+                        wmt_clearbits(data, reg_pull_en, BIT(bit));
+                        break;
+                case PIN_CONFIG_BIAS_PULL_DOWN:
+                        wmt_clearbits(data, reg_pull_cfg, BIT(bit));
+                        wmt_setbits(data, reg_pull_en, BIT(bit));
+                        break;
+                case PIN_CONFIG_BIAS_PULL_UP:
+                        wmt_setbits(data, reg_pull_cfg, BIT(bit));
+                        wmt_setbits(data, reg_pull_en, BIT(bit));
+                        break;
+                default:
+                        dev_err(data->dev, "unknown pinconf param\n");
+                        return -EINVAL;
+                }
+        } /* for each config */
 
         return 0;
 }