pinctrl/lantiq: add output pinconf parameter

While converting the boards inside OpenWrt to OF I noticed
that the we are missing a pinconf parameter to set a pin
to output.

Signed-off-by: John Crispin <blogic@openwrt.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/pinctrl-lantiq.h b/drivers/pinctrl/pinctrl-lantiq.h
index 4419d32a0ade00acb70d2ad56da68ea108d969ab..6d07f0238532050c1c7ecd54cefd65bb8439ddaf 100644 (file)
--- a/drivers/pinctrl/pinctrl-lantiq.h
+++ b/drivers/pinctrl/pinctrl-lantiq.h
@@ -34,6 +34,7 @@ enum ltq_pinconf_param {
        LTQ_PINCONF_PARAM_OPEN_DRAIN,
        LTQ_PINCONF_PARAM_DRIVE_CURRENT,
        LTQ_PINCONF_PARAM_SLEW_RATE,
+       LTQ_PINCONF_PARAM_OUTPUT,
 };
 
 struct ltq_cfg_param {

diff --git a/drivers/pinctrl/pinctrl-xway.c b/drivers/pinctrl/pinctrl-xway.c
index aa4c8b815c20bdda1c915a52bacfcec7fba5a8e5..b23b8954ae31f17d4613df5b51add4d2500e2e15 100644 (file)
--- a/drivers/pinctrl/pinctrl-xway.c
+++ b/drivers/pinctrl/pinctrl-xway.c
@@ -466,6 +466,11 @@ static int xway_pinconf_get(struct pinctrl_dev *pctldev,
                        *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;
@@ -515,6 +520,14 @@ static int xway_pinconf_set(struct pinctrl_dev *pctldev,
                        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;
@@ -573,6 +586,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 = {