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>

24 files changed, 952 insertions, 726 deletions

diff --git a/drivers/pinctrl/mvebu/pinctrl-mvebu.c b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
index bb7ddb1bc89f..e78c041c3c73 100644
--- a/drivers/pinctrl/mvebu/pinctrl-mvebu.c
+++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
@@ -191,18 +191,27 @@ static int mvebu_pinconf_group_get(struct pinctrl_dev *pctldev,
 }
 
 static int mvebu_pinconf_group_set(struct pinctrl_dev *pctldev,
-                                unsigned gid, unsigned long config)
+                                unsigned gid, unsigned long *configs,
+                                unsigned num_configs)
 {
         struct mvebu_pinctrl *pctl = pinctrl_dev_get_drvdata(pctldev);
         struct mvebu_pinctrl_group *grp = &pctl->groups[gid];
+        int i, ret;
 
         if (!grp->ctrl)
                 return -EINVAL;
 
-        if (grp->ctrl->mpp_set)
-                return grp->ctrl->mpp_set(grp->ctrl, config);
+        for (i = 0; i < num_configs; i++) {
+                if (grp->ctrl->mpp_set)
+                        ret = grp->ctrl->mpp_set(grp->ctrl, configs[i]);
+                else
+                        ret = mvebu_common_mpp_set(pctl, grp, configs[i]);
 
-        return mvebu_common_mpp_set(pctl, grp, config);
+                if (ret)
+                        return ret;
+        } /* for each config */
+
+        return 0;
 }
 
 static void mvebu_pinconf_group_dbg_show(struct pinctrl_dev *pctldev,
@@ -303,6 +312,7 @@ static int mvebu_pinmux_enable(struct pinctrl_dev *pctldev, unsigned fid,
         struct mvebu_pinctrl_group *grp = &pctl->groups[gid];
         struct mvebu_mpp_ctrl_setting *setting;
         int ret;
+        unsigned long config;
 
         setting = mvebu_pinctrl_find_setting_by_name(pctl, grp,
                                                      func->name);
@@ -313,7 +323,8 @@ static int mvebu_pinmux_enable(struct pinctrl_dev *pctldev, unsigned fid,
                 return -EINVAL;
         }
 
-        ret = mvebu_pinconf_group_set(pctldev, grp->gid, setting->val);
+        config = setting->val;
+        ret = mvebu_pinconf_group_set(pctldev, grp->gid, &config, 1);
         if (ret) {
                 dev_err(pctl->dev, "cannot set group %s to %s\n",
                         func->groups[gid], func->name);
@@ -329,6 +340,7 @@ static int mvebu_pinmux_gpio_request_enable(struct pinctrl_dev *pctldev,
         struct mvebu_pinctrl *pctl = pinctrl_dev_get_drvdata(pctldev);
         struct mvebu_pinctrl_group *grp;
         struct mvebu_mpp_ctrl_setting *setting;
+        unsigned long config;
 
         grp = mvebu_pinctrl_find_group_by_pid(pctl, offset);
         if (!grp)
@@ -341,7 +353,9 @@ static int mvebu_pinmux_gpio_request_enable(struct pinctrl_dev *pctldev,
         if (!setting)
                 return -ENOTSUPP;
 
-        return mvebu_pinconf_group_set(pctldev, grp->gid, setting->val);
+        config = setting->val;
+
+        return mvebu_pinconf_group_set(pctldev, grp->gid, &config, 1);
 }
 
 static int mvebu_pinmux_gpio_set_direction(struct pinctrl_dev *pctldev,
diff --git a/drivers/pinctrl/pinconf.c b/drivers/pinctrl/pinconf.c
index 8da2d6db228c..a138965c01cb 100644
--- a/drivers/pinctrl/pinconf.c
+++ b/drivers/pinctrl/pinconf.c
@@ -158,7 +158,7 @@ int pinconf_apply_setting(struct pinctrl_setting const *setting)
 {
         struct pinctrl_dev *pctldev = setting->pctldev;
         const struct pinconf_ops *ops = pctldev->desc->confops;
-        int i, ret;
+        int ret;
 
         if (!ops) {
                 dev_err(pctldev->dev, "missing confops\n");
@@ -171,17 +171,15 @@ int pinconf_apply_setting(struct pinctrl_setting const *setting)
                         dev_err(pctldev->dev, "missing pin_config_set op\n");
                         return -EINVAL;
                 }
-                for (i = 0; i < setting->data.configs.num_configs; i++) {
-                        ret = ops->pin_config_set(pctldev,
-                                        setting->data.configs.group_or_pin,
-                                        setting->data.configs.configs[i]);
-                        if (ret < 0) {
-                                dev_err(pctldev->dev,
-                                        "pin_config_set op failed for pin %d config %08lx\n",
-                                        setting->data.configs.group_or_pin,
-                                        setting->data.configs.configs[i]);
-                                return ret;
-                        }
+                ret = ops->pin_config_set(pctldev,
+                                setting->data.configs.group_or_pin,
+                                setting->data.configs.configs,
+                                setting->data.configs.num_configs);
+                if (ret < 0) {
+                        dev_err(pctldev->dev,
+                                "pin_config_set op failed for pin %d\n",
+                                setting->data.configs.group_or_pin);
+                        return ret;
                 }
                 break;
         case PIN_MAP_TYPE_CONFIGS_GROUP:
@@ -190,17 +188,15 @@ int pinconf_apply_setting(struct pinctrl_setting const *setting)
                                 "missing pin_config_group_set op\n");
                         return -EINVAL;
                 }
-                for (i = 0; i < setting->data.configs.num_configs; i++) {
-                        ret = ops->pin_config_group_set(pctldev,
-                                        setting->data.configs.group_or_pin,
-                                        setting->data.configs.configs[i]);
-                        if (ret < 0) {
-                                dev_err(pctldev->dev,
-                                        "pin_config_group_set op failed for group %d config %08lx\n",
-                                        setting->data.configs.group_or_pin,
+                ret = ops->pin_config_group_set(pctldev,
+                                setting->data.configs.group_or_pin,
+                                setting->data.configs.configs,
+                                setting->data.configs.num_configs);
+                if (ret < 0) {
+                        dev_err(pctldev->dev,
+                                "pin_config_group_set op failed for group %d\n",
+                                setting->data.configs.group_or_pin);