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, 35 insertions, 22 deletions

diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c
index 51a7c24981d1..abff5895e81f 100644
--- a/drivers/pinctrl/pinctrl-rockchip.c
+++ b/drivers/pinctrl/pinctrl-rockchip.c
@@ -574,32 +574,45 @@ static bool rockchip_pinconf_pull_valid(struct rockchip_pin_ctrl *ctrl,
 
 /* set the pin config settings for a specified pin */
 static int rockchip_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin,
-                                                        unsigned long config)
+                                unsigned long *configs, unsigned num_configs)
 {
         struct rockchip_pinctrl *info = pinctrl_dev_get_drvdata(pctldev);
         struct rockchip_pin_bank *bank = pin_to_bank(info, pin);
-        enum pin_config_param param = pinconf_to_config_param(config);
-        u16 arg = pinconf_to_config_argument(config);
-
-        switch (param) {
-        case PIN_CONFIG_BIAS_DISABLE:
-                return rockchip_set_pull(bank, pin - bank->pin_base, param);
-                break;
-        case PIN_CONFIG_BIAS_PULL_UP:
-        case PIN_CONFIG_BIAS_PULL_DOWN:
-        case PIN_CONFIG_BIAS_PULL_PIN_DEFAULT:
-                if (!rockchip_pinconf_pull_valid(info->ctrl, param))
+        enum pin_config_param param;
+        u16 arg;
+        int i;
+        int rc;
+
+        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:
+                        rc =  rockchip_set_pull(bank, pin - bank->pin_base,
+                                param);
+                        if (rc)
+                                return rc;
+                        break;
+                case PIN_CONFIG_BIAS_PULL_UP:
+                case PIN_CONFIG_BIAS_PULL_DOWN:
+                case PIN_CONFIG_BIAS_PULL_PIN_DEFAULT:
+                        if (!rockchip_pinconf_pull_valid(info->ctrl, param))
+                                return -ENOTSUPP;
+
+                        if (!arg)
+                                return -EINVAL;
+
+                        rc = rockchip_set_pull(bank, pin - bank->pin_base,
+                                param);
+                        if (rc)
+                                return rc;
+                        break;
+                default:
                         return -ENOTSUPP;
-
-                if (!arg)
-                        return -EINVAL;
-
-                return rockchip_set_pull(bank, pin - bank->pin_base, param);
-                break;
-        default:
-                return -ENOTSUPP;
-                break;
-        }
+                        break;
+                }
+        } /* for each config */
 
         return 0;
 }