Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 350508
b: refs/heads/master
c: 6360350
h: refs/heads/master
v: v3
  • Loading branch information
John Crispin authored and Linus Walleij committed Feb 5, 2013
1 parent b51e83d commit 40ed786
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3a6b04ca33a225dd64fcd5f4469b7b1088f16c37
refs/heads/master: 6360350cbc0567f51afacb2d1e6a8e611b3b9b2b
1 change: 1 addition & 0 deletions trunk/drivers/pinctrl/pinctrl-lantiq.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
14 changes: 14 additions & 0 deletions trunk/drivers/pinctrl/pinctrl-xway.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 = {
Expand Down

0 comments on commit 40ed786

Please sign in to comment.