1 files changed, 46 insertions, 14 deletions

diff --git a/drivers/pinctrl/pinctrl-xway.c b/drivers/pinctrl/pinctrl-xway.c
index 5f0eb04c2336..53cb6a3a56ed 100644
--- a/drivers/pinctrl/pinctrl-xway.c
+++ b/drivers/pinctrl/pinctrl-xway.c
@@ -441,17 +441,17 @@ static int xway_pinconf_get(struct pinctrl_dev *pctldev,
                 if (port == PORT3)
                         reg = GPIO3_OD;
                 else
-                        reg = GPIO_OD(port);
+                        reg = GPIO_OD(pin);
                 *config = LTQ_PINCONF_PACK(param,
-                        !!gpio_getbit(info->membase[0], reg, PORT_PIN(port)));
+                        !gpio_getbit(info->membase[0], reg, PORT_PIN(pin)));
                 break;
 
         case LTQ_PINCONF_PARAM_PULL:
                 if (port == PORT3)
                         reg = GPIO3_PUDEN;
                 else
-                        reg = GPIO_PUDEN(port);
-                if (!gpio_getbit(info->membase[0], reg, PORT_PIN(port))) {
+                        reg = GPIO_PUDEN(pin);
+                if (!gpio_getbit(info->membase[0], reg, PORT_PIN(pin))) {
                         *config = LTQ_PINCONF_PACK(param, 0);
                         break;
                 }
@@ -459,13 +459,18 @@ static int xway_pinconf_get(struct pinctrl_dev *pctldev,
                 if (port == PORT3)
                         reg = GPIO3_PUDSEL;
                 else
-                        reg = GPIO_PUDSEL(port);
-                if (!gpio_getbit(info->membase[0], reg, PORT_PIN(port)))
+                        reg = GPIO_PUDSEL(pin);
+                if (!gpio_getbit(info->membase[0], reg, PORT_PIN(pin)))
                         *config = LTQ_PINCONF_PACK(param, 2);
                 else
                         *config = LTQ_PINCONF_PACK(param, 1);
                 break;
 
+        case LTQ_PINCONF_PARAM_OUTPUT:
+                reg = GPIO_DIR(pin);
+                *config = LTQ_PINCONF_PACK(param,
+                        gpio_getbit(info->membase[0], reg, PORT_PIN(pin)));
+                break;
         default:
                 dev_err(pctldev->dev, "Invalid config param %04x\n", param);
                 return -ENOTSUPP;
@@ -488,33 +493,44 @@ static int xway_pinconf_set(struct pinctrl_dev *pctldev,
                 if (port == PORT3)
                         reg = GPIO3_OD;
                 else
-                        reg = GPIO_OD(port);
-                gpio_setbit(info->membase[0], reg, PORT_PIN(port));
+                        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;
 
         case LTQ_PINCONF_PARAM_PULL:
                 if (port == PORT3)
                         reg = GPIO3_PUDEN;
                 else
-                        reg = GPIO_PUDEN(port);
+                        reg = GPIO_PUDEN(pin);
                 if (arg == 0) {
-                        gpio_clearbit(info->membase[0], reg, PORT_PIN(port));
+                        gpio_clearbit(info->membase[0], reg, PORT_PIN(pin));
                         break;
                 }
-                gpio_setbit(info->membase[0], reg, PORT_PIN(port));
+                gpio_setbit(info->membase[0], reg, PORT_PIN(pin));
 
                 if (port == PORT3)
                         reg = GPIO3_PUDSEL;
                 else
-                        reg = GPIO_PUDSEL(port);
+                        reg = GPIO_PUDSEL(pin);
                 if (arg == 1)
-                        gpio_clearbit(info->membase[0], reg, PORT_PIN(port));
+                        gpio_clearbit(info->membase[0], reg, PORT_PIN(pin));
                 else if (arg == 2)
-                        gpio_setbit(info->membase[0], reg, PORT_PIN(port));
+                        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;
+
         default:
                 dev_err(pctldev->dev, "Invalid config param %04x\n", param);
                 return -ENOTSUPP;
@@ -522,9 +538,24 @@ static int xway_pinconf_set(struct pinctrl_dev *pctldev,
         return 0;
 }
 
+int xway_pinconf_group_set(struct pinctrl_dev *pctldev,
+                        unsigned selector,
+                        unsigned long config)
+{
+        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);
+
+        return ret;
+}
+
 static struct pinconf_ops xway_pinconf_ops = {
         .pin_config_get = xway_pinconf_get,
         .pin_config_set = xway_pinconf_set,
+        .pin_config_group_set = xway_pinconf_group_set,
 };
 
 static struct pinctrl_desc xway_pctrl_desc = {
@@ -558,6 +589,7 @@ static inline int xway_mux_apply(struct pinctrl_dev *pctrldev,
 static const struct ltq_cfg_param xway_cfg_params[] = {
         {"lantiq,pull",         LTQ_PINCONF_PARAM_PULL},
         {"lantiq,open-drain",   LTQ_PINCONF_PARAM_OPEN_DRAIN},
+        {"lantiq,output",       LTQ_PINCONF_PARAM_OUTPUT},
 };
 
 static struct ltq_pinmux_info xway_info = {