diff options
| author | Chen-Yu Tsai <wens@csie.org> | 2016-11-11 17:50:34 +0800 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2016-11-15 10:17:45 +0100 |
| commit | 223dba00b4072efc590c7d648f230db1b44186b9 (patch) | |
| tree | f573d75e2f553d9148fd6c95f5d550a319e50bf3 /drivers/pinctrl/sunxi | |
| parent | 88f01a1bd0e0dbd01b65907023dbe53cf524ea2a (diff) | |
| download | op-kernel-dev-223dba00b4072efc590c7d648f230db1b44186b9.zip op-kernel-dev-223dba00b4072efc590c7d648f230db1b44186b9.tar.gz | |
pinctrl: sunxi: Fix PIN_CONFIG_BIAS_PULL_{DOWN,UP} argument
According to pinconf-generic.h, the argument for
PIN_CONFIG_BIAS_PULL_{DOWN,UP} is non-zero if the bias is enabled
with a pull up/down resistor, zero if it is directly connected
to VDD or ground.
Since Allwinner hardware uses a weak pull resistor internally,
the argument should be 1.
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/sunxi')
| -rw-r--r-- | drivers/pinctrl/sunxi/pinctrl-sunxi.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/pinctrl/sunxi/pinctrl-sunxi.c b/drivers/pinctrl/sunxi/pinctrl-sunxi.c index e199d95..e04edda 100644 --- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c +++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c @@ -291,12 +291,16 @@ static unsigned long *sunxi_pctrl_build_pin_config(struct device_node *node, if (sunxi_pctrl_has_bias_prop(node)) { int pull = sunxi_pctrl_parse_bias_prop(node); + int arg = 0; if (pull < 0) { ret = pull; goto err_free; } - pinconfig[idx++] = pinconf_to_config_packed(pull, 0); + if (pull != PIN_CONFIG_BIAS_DISABLE) + arg = 1; /* hardware uses weak pull resistors */ + + pinconfig[idx++] = pinconf_to_config_packed(pull, arg); } |
