pinctrl: at91-pio4: Fix slew rate disablement

[linux-2.6-block.git] / drivers / pinctrl / pinctrl-at91-pio4.c

diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c
index e71ebccc479cf8e76d4038144b79322e8a22619b..03c32b2c5d303315733acc1abb3e779f21d65bee 100644 (file)
--- a/drivers/pinctrl/pinctrl-at91-pio4.c
+++ b/drivers/pinctrl/pinctrl-at91-pio4.c
@@ -801,6 +801,10 @@ static int atmel_conf_pin_config_group_set(struct pinctrl_dev *pctldev,
 
        conf = atmel_pin_config_read(pctldev, pin_id);
 
+       /* Keep slew rate enabled by default. */
+       if (atmel_pioctrl->slew_rate_support)
+               conf |= ATMEL_PIO_SR_MASK;
+
        for (i = 0; i < num_configs; i++) {
                unsigned int param = pinconf_to_config_param(configs[i]);
                unsigned int arg = pinconf_to_config_argument(configs[i]);
@@ -808,10 +812,6 @@ static int atmel_conf_pin_config_group_set(struct pinctrl_dev *pctldev,
                dev_dbg(pctldev->dev, "%s: pin=%u, config=0x%lx\n",
                        __func__, pin_id, configs[i]);
 
-               /* Keep slew rate enabled by default. */
-               if (atmel_pioctrl->slew_rate_support)
-                       conf |= ATMEL_PIO_SR_MASK;
-
                switch (param) {
                case PIN_CONFIG_BIAS_DISABLE:
                        conf &= (~ATMEL_PIO_PUEN_MASK);