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, 73 insertions, 46 deletions

diff --git a/drivers/pinctrl/pinctrl-xway.c b/drivers/pinctrl/pinctrl-xway.c
index 86c8cf82105b..ed2d1ba69cef 100644
--- a/drivers/pinctrl/pinctrl-xway.c
+++ b/drivers/pinctrl/pinctrl-xway.c
@@ -499,74 +499,101 @@ static int xway_pinconf_get(struct pinctrl_dev *pctldev,
 
 static int xway_pinconf_set(struct pinctrl_dev *pctldev,
                                 unsigned pin,
-                                unsigned long config)
+                                unsigned long *configs,
+                                unsigned num_configs)
 {
         struct ltq_pinmux_info *info = pinctrl_dev_get_drvdata(pctldev);
-        enum ltq_pinconf_param param = LTQ_PINCONF_UNPACK_PARAM(config);
-        int arg = LTQ_PINCONF_UNPACK_ARG(config);
+        enum ltq_pinconf_param param;
+        int arg;
         int port = PORT(pin);
         u32 reg;
+        int i;
+
+        for (i = 0; i < num_configs; i++) {
+                param = LTQ_PINCONF_UNPACK_PARAM(configs[i]);
+                arg = LTQ_PINCONF_UNPACK_ARG(configs[i]);
+
+                switch (param) {
+                case LTQ_PINCONF_PARAM_OPEN_DRAIN:
+                        if (port == PORT3)
+                                reg = GPIO3_OD;
+                        else
+                                reg = GPIO_OD(pin);
+                        if (arg == 0)
+                                gpio_setbit(info->membase[0],
+                                        reg,
+                                        PORT_PIN(pin));
+                        else
+                                gpio_clearbit(info->membase[0],
+                                        reg,
+                                        PORT_PIN(pin));
+                        break;
 
-        switch (param) {
-        case LTQ_PINCONF_PARAM_OPEN_DRAIN:
-                if (port == PORT3)
-                        reg = GPIO3_OD;
-                else
-                        reg = GPIO_OD(pin);
-                if (arg == 0)
+                case LTQ_PINCONF_PARAM_PULL:
+                        if (port == PORT3)
+                                reg = GPIO3_PUDEN;
+                        else
+                                reg = GPIO_PUDEN(pin);
+                        if (arg == 0) {
+                                gpio_clearbit(info->membase[0],
+                                        reg,
+                                        PORT_PIN(pin));
+                                break;
+                        }
                         gpio_setbit(info->membase[0], reg, PORT_PIN(pin));
-                else
-                        gpio_clearbit(info->membase[0], reg, PORT_PIN(pin));
-                break;
 
-        case LTQ_PINCONF_PARAM_PULL:
-                if (port == PORT3)
-                        reg = GPIO3_PUDEN;
-                else
-                        reg = GPIO_PUDEN(pin);
-                if (arg == 0) {
-                        gpio_clearbit(info->membase[0], reg, PORT_PIN(pin));
+                        if (port == PORT3)
+                                reg = GPIO3_PUDSEL;
+                        else
+                                reg = GPIO_PUDSEL(pin);
+                        if (arg == 1)
+                                gpio_clearbit(info->membase[0],
+                                        reg,
+                                        PORT_PIN(pin));
+                        else if (arg == 2)
+                                gpio_setbit(info->membase[0],
+                                        reg,
+                                        PORT_PIN(pin));
+                        else
+                                dev_err(pctldev->dev,
+                                        "Invalid pull value %d\n", arg);
                         break;
-                }
-                gpio_setbit(info->membase[0], reg, PORT_PIN(pin));
 
-                if (port == PORT3)
-                        reg = GPIO3_PUDSEL;
-                else
-                        reg = GPIO_PUDSEL(pin);
-                if (arg == 1)
-                        gpio_clearbit(info->membase[0], reg, PORT_PIN(pin));
-                else if (arg == 2)
-                        gpio_setbit(info->membase[0], reg, PORT_PIN(pin));
-                else
-                        dev_err(pctldev->dev, "Invalid pull value %d\n", arg);
-                break;
+                case LTQ_PINCONF_PARAM_OUTPUT:
+                        reg = GPIO_DIR(pin);
+                        if (arg == 0)
+                                gpio_clearbit(info->membase[0],
+                                        reg,
+                                        PORT_PIN(pin));
+                        else
+                                gpio_setbit(info->membase[0],
+                                        reg,
+                                        PORT_PIN(pin));
+                        break;
 
-        case LTQ_PINCONF_PARAM_OUTPUT:
-                reg = GPIO_DIR(pin);
-                if (arg == 0)
-                        gpio_clearbit(info->membase[0], reg, PORT_PIN(pin));
-                else
-                        gpio_setbit(info->membase[0], reg, PORT_PIN(pin));
-                break;
+                default:
+                        dev_err(pctldev->dev,
+                                "Invalid config param %04x\n", param);
+                        return -ENOTSUPP;
+                }
+        } /* for each config */
 
-        default:
-                dev_err(pctldev->dev, "Invalid config param %04x\n", param);
-                return -ENOTSUPP;
-        }
         return 0;
 }
 
 int xway_pinconf_group_set(struct pinctrl_dev *pctldev,
                         unsigned selector,
-                        unsigned long config)
+                        unsigned long *configs,
+                        unsigned num_configs)
 {
         struct ltq_pinmux_info *info = pinctrl_dev_get_drvdata(pctldev);
         int i, ret = 0;
 
         for (i = 0; i < info->grps[selector].npins && !ret; i++)
                 ret = xway_pinconf_set(pctldev,
-                                info->grps[selector].pins[i], config);
+                                info->grps[selector].pins[i],
+                                configs,
+                                num_configs);
 
         return ret;
 }