| Message ID | f4de32e1b124b25c27e34efcadc1d332cb93ee59.1475489558.git-series.maxime.ripard@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Oct 3, 2016 at 6:21 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > So far, putting NO_PULL in allwinner,pull was ignored, behaving like if > that property was not there at all. > > Obviously, this is not the right thing to do, and in that case, we really > need to just disable the bias. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> I've done the same in my patches. Acked-by: Chen-Yu Tsai <wens@csie.org> > --- > drivers/pinctrl/sunxi/pinctrl-sunxi.c | 8 ++++++++ > 1 file changed, 8 insertions(+), 0 deletions(-) > > diff --git a/drivers/pinctrl/sunxi/pinctrl-sunxi.c b/drivers/pinctrl/sunxi/pinctrl-sunxi.c > index 5be455d5e252..6f6f1e0011e2 100644 > --- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c > +++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c > @@ -166,6 +166,8 @@ static int sunxi_pctrl_parse_bias_prop(struct device_node *node) > return -EINVAL; > > switch (val) { > + case SUN4I_PINCTRL_NO_PULL: > + return PIN_CONFIG_BIAS_DISABLE; > case SUN4I_PINCTRL_PULL_UP: > return PIN_CONFIG_BIAS_PULL_UP; > case SUN4I_PINCTRL_PULL_DOWN: > @@ -402,6 +404,12 @@ static int sunxi_pconf_group_set(struct pinctrl_dev *pctldev, > | dlevel << sunxi_dlevel_offset(pin), > pctl->membase + sunxi_dlevel_reg(pin)); > break; > + case PIN_CONFIG_BIAS_DISABLE: > + val = readl(pctl->membase + sunxi_pull_reg(pin)); > + mask = PULL_PINS_MASK << sunxi_pull_offset(pin); > + writel((val & ~mask), > + pctl->membase + sunxi_pull_reg(pin)); > + break; > case PIN_CONFIG_BIAS_PULL_UP: > val = readl(pctl->membase + sunxi_pull_reg(pin)); > mask = PULL_PINS_MASK << sunxi_pull_offset(pin); > -- > git-series 0.8.10
diff --git a/drivers/pinctrl/sunxi/pinctrl-sunxi.c b/drivers/pinctrl/sunxi/pinctrl-sunxi.c index 5be455d5e252..6f6f1e0011e2 100644 --- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c +++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c @@ -166,6 +166,8 @@ static int sunxi_pctrl_parse_bias_prop(struct device_node *node) return -EINVAL; switch (val) { + case SUN4I_PINCTRL_NO_PULL: + return PIN_CONFIG_BIAS_DISABLE; case SUN4I_PINCTRL_PULL_UP: return PIN_CONFIG_BIAS_PULL_UP; case SUN4I_PINCTRL_PULL_DOWN: @@ -402,6 +404,12 @@ static int sunxi_pconf_group_set(struct pinctrl_dev *pctldev, | dlevel << sunxi_dlevel_offset(pin), pctl->membase + sunxi_dlevel_reg(pin)); break; + case PIN_CONFIG_BIAS_DISABLE: + val = readl(pctl->membase + sunxi_pull_reg(pin)); + mask = PULL_PINS_MASK << sunxi_pull_offset(pin); + writel((val & ~mask), + pctl->membase + sunxi_pull_reg(pin)); + break; case PIN_CONFIG_BIAS_PULL_UP: val = readl(pctl->membase + sunxi_pull_reg(pin)); mask = PULL_PINS_MASK << sunxi_pull_offset(pin);
So far, putting NO_PULL in allwinner,pull was ignored, behaving like if that property was not there at all. Obviously, this is not the right thing to do, and in that case, we really need to just disable the bias. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- drivers/pinctrl/sunxi/pinctrl-sunxi.c | 8 ++++++++ 1 file changed, 8 insertions(+), 0 deletions(-)