Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pinctrl/lantiq: add output pinconf parameter

Browse source 
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>
This commit is contained in:
John Crispin 2013-02-01 13:04:58 +01:00 committed by Linus Walleij
parent 3a6b04ca33
commit 6360350cbc
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/pinctrl/pinctrl-lantiq.h
View file

@ -34,6 +34,7 @@ enum ltq_pinconf_param {
LTQ_PINCONF_PARAM_OPEN_DRAIN, LTQ_PINCONF_PARAM_OPEN_DRAIN,
LTQ_PINCONF_PARAM_DRIVE_CURRENT, LTQ_PINCONF_PARAM_DRIVE_CURRENT,
LTQ_PINCONF_PARAM_SLEW_RATE, LTQ_PINCONF_PARAM_SLEW_RATE,
LTQ_PINCONF_PARAM_OUTPUT,
}; };
struct ltq_cfg_param { struct ltq_cfg_param {

14
drivers/pinctrl/pinctrl-xway.c
View file

@ -466,6 +466,11 @@ static int xway_pinconf_get(struct pinctrl_dev *pctldev,
*config = LTQ_PINCONF_PACK(param, 1); *config = LTQ_PINCONF_PACK(param, 1);
break; 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: default:
dev_err(pctldev->dev, "Invalid config param %04x\n", param); dev_err(pctldev->dev, "Invalid config param %04x\n", param);
return -ENOTSUPP; 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); dev_err(pctldev->dev, "Invalid pull value %d\n", arg);
break; 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: default:
dev_err(pctldev->dev, "Invalid config param %04x\n", param); dev_err(pctldev->dev, "Invalid config param %04x\n", param);
return -ENOTSUPP; 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[] = { static const struct ltq_cfg_param xway_cfg_params[] = {
{"lantiq,pull", LTQ_PINCONF_PARAM_PULL}, {"lantiq,pull", LTQ_PINCONF_PARAM_PULL},
{"lantiq,open-drain", LTQ_PINCONF_PARAM_OPEN_DRAIN}, {"lantiq,open-drain", LTQ_PINCONF_PARAM_OPEN_DRAIN},
{"lantiq,output", LTQ_PINCONF_PARAM_OUTPUT},
}; };
static struct ltq_pinmux_info xway_info = { static struct ltq_pinmux_info xway_info = {