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

diff --git a/drivers/pinctrl/sh-pfc/pinctrl.c b/drivers/pinctrl/sh-pfc/pinctrl.c
index 8649ec3910a3..e758af95c209 100644
--- a/drivers/pinctrl/sh-pfc/pinctrl.c
+++ b/drivers/pinctrl/sh-pfc/pinctrl.c
@@ -529,38 +529,44 @@ static int sh_pfc_pinconf_get(struct pinctrl_dev *pctldev, unsigned _pin,
 }
 
 static int sh_pfc_pinconf_set(struct pinctrl_dev *pctldev, unsigned _pin,
-                              unsigned long config)
+                              unsigned long *configs, unsigned num_configs)
 {
         struct sh_pfc_pinctrl *pmx = pinctrl_dev_get_drvdata(pctldev);
         struct sh_pfc *pfc = pmx->pfc;
-        enum pin_config_param param = pinconf_to_config_param(config);
+        enum pin_config_param param;
         unsigned long flags;
+        unsigned int i;
 
-        if (!sh_pfc_pinconf_validate(pfc, _pin, param))
-                return -ENOTSUPP;
+        for (i = 0; i < num_configs; i++) {
+                param = pinconf_to_config_param(configs[i]);
 
-        switch (param) {
-        case PIN_CONFIG_BIAS_PULL_UP:
-        case PIN_CONFIG_BIAS_PULL_DOWN:
-        case PIN_CONFIG_BIAS_DISABLE:
-                if (!pfc->info->ops || !pfc->info->ops->set_bias)
+                if (!sh_pfc_pinconf_validate(pfc, _pin, param))
                         return -ENOTSUPP;
 
-                spin_lock_irqsave(&pfc->lock, flags);
-                pfc->info->ops->set_bias(pfc, _pin, param);
-                spin_unlock_irqrestore(&pfc->lock, flags);
+                switch (param) {
+                case PIN_CONFIG_BIAS_PULL_UP:
+                case PIN_CONFIG_BIAS_PULL_DOWN:
+                case PIN_CONFIG_BIAS_DISABLE:
+                        if (!pfc->info->ops || !pfc->info->ops->set_bias)
+                                return -ENOTSUPP;
 
-                break;
+                        spin_lock_irqsave(&pfc->lock, flags);
+                        pfc->info->ops->set_bias(pfc, _pin, param);
+                        spin_unlock_irqrestore(&pfc->lock, flags);
 
-        default:
-                return -ENOTSUPP;
-        }
+                        break;
+
+                default:
+                        return -ENOTSUPP;
+                }
+        } /* for each config */
 
         return 0;
 }
 
 static int sh_pfc_pinconf_group_set(struct pinctrl_dev *pctldev, unsigned group,
-                                    unsigned long config)
+                                    unsigned long *configs,
+                                    unsigned num_configs)
 {
         struct sh_pfc_pinctrl *pmx = pinctrl_dev_get_drvdata(pctldev);
         const unsigned int *pins;
@@ -571,7 +577,7 @@ static int sh_pfc_pinconf_group_set(struct pinctrl_dev *pctldev, unsigned group,
         num_pins = pmx->pfc->info->groups[group].nr_pins;
 
         for (i = 0; i < num_pins; ++i)
-                sh_pfc_pinconf_set(pctldev, pins[i], config);
+                sh_pfc_pinconf_set(pctldev, pins[i], configs, num_configs);
 
         return 0;
 }