| Message ID | 201306141744.21117.heiko@sntech.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Jun 14, 2013 at 5:44 PM, Heiko Stübner <heiko@sntech.de> wrote: > Change the rockchip pinctrl driver to handle the arguments of 0 or 1 to > the pull pinconfig options correctly, so that the pull gets disabled when > either the bias_disable options is set or the pull option has the argument 0. > > Signed-off-by: Heiko Stuebner <heiko@sntech.de> Patch applied so we can move ahead but: > case PIN_CONFIG_BIAS_PULL_UP: > case PIN_CONFIG_BIAS_PULL_DOWN: > case PIN_CONFIG_BIAS_PULL_PIN_DEFAULT: > + if (!rockchip_pinconf_pull_valid(info->ctrl, param)) > + return -ENOTSUPP; > + > + if (!arg) > + param = PIN_CONFIG_BIAS_DISABLE; This is what I think is counter-intuitive. Can't you rely on the bias-disable here instead? > - *config = 0; > + pull = rockchip_get_pull(bank, pin - bank->pin_base); > + *config = (pull == param) ? 1 : 0; And then I guess you should emit PIN_CONFIG_BIAS_DISABLE here as well. Yours, Linus Walleij
Am Sonntag, 16. Juni 2013, 12:35:43 schrieb Linus Walleij: > On Fri, Jun 14, 2013 at 5:44 PM, Heiko Stübner <heiko@sntech.de> wrote: > > Change the rockchip pinctrl driver to handle the arguments of 0 or 1 to > > the pull pinconfig options correctly, so that the pull gets disabled when > > either the bias_disable options is set or the pull option has the > > argument 0. > > > > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > > Patch applied so we can move ahead but: > > case PIN_CONFIG_BIAS_PULL_UP: > > case PIN_CONFIG_BIAS_PULL_DOWN: > > > > case PIN_CONFIG_BIAS_PULL_PIN_DEFAULT: > > + if (!rockchip_pinconf_pull_valid(info->ctrl, param)) > > + return -ENOTSUPP; > > + > > + if (!arg) > > + param = PIN_CONFIG_BIAS_DISABLE; > > This is what I think is counter-intuitive. > > Can't you rely on the bias-disable here instead? > > > - *config = 0; > > + pull = rockchip_get_pull(bank, pin - bank->pin_base); > > + *config = (pull == param) ? 1 : 0; > > And then I guess you should emit PIN_CONFIG_BIAS_DISABLE > here as well. rockchip_get_pull does emit PIN_CONFIG_BIAS_DISABLE when the pull is disabled, only wrongly does add the argument here. But I'm actually not quite sure what the expected behaviour is here at all :-) Say the pin is in the "pin-default" pull state and the query in config_get is for "bias-disable", what would be the expected bahviour/return value in this case? Thanks Heiko
On Sun, Jun 16, 2013 at 1:02 PM, Heiko Stübner <heiko@sntech.de> wrote: >> > - *config = 0; >> > + pull = rockchip_get_pull(bank, pin - bank->pin_base); >> > + *config = (pull == param) ? 1 : 0; >> >> And then I guess you should emit PIN_CONFIG_BIAS_DISABLE >> here as well. > > rockchip_get_pull does emit PIN_CONFIG_BIAS_DISABLE when the pull is disabled, > only wrongly does add the argument here. Ah, right. > But I'm actually not quite sure what the expected behaviour is here at all :-) > > Say the pin is in the "pin-default" pull state and the query in config_get is > for "bias-disable", what would be the expected bahviour/return value in this > case? return -EINVAL; ? Hm it was some time since I designed this... Yours, Linus Walleij
diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c index c605b63..2568afc 100644 --- a/drivers/pinctrl/pinctrl-rockchip.c +++ b/drivers/pinctrl/pinctrl-rockchip.c @@ -563,6 +563,25 @@ static const struct pinmux_ops rockchip_pmx_ops = { * Pinconf_ops handling */ +static bool rockchip_pinconf_pull_valid(struct rockchip_pin_ctrl *ctrl, + enum pin_config_param pull) +{ + /* rk3066b does support any pulls */ + if (!ctrl->pull_offset) + return pull ? false : true; + + if (ctrl->pull_auto) { + if (pull != PIN_CONFIG_BIAS_PULL_PIN_DEFAULT && + pull != PIN_CONFIG_BIAS_DISABLE) + return false; + } else { + if (pull == PIN_CONFIG_BIAS_PULL_PIN_DEFAULT) + return false; + } + + return true; +} + /* set the pin config settings for a specified pin */ static int rockchip_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin, unsigned long config) @@ -570,12 +589,21 @@ static int rockchip_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin, struct rockchip_pinctrl *info = pinctrl_dev_get_drvdata(pctldev); struct rockchip_pin_bank *bank = pin_to_bank(info, pin); enum pin_config_param param = pinconf_to_config_param(config); + u16 arg = pinconf_to_config_argument(config); switch (param) { case PIN_CONFIG_BIAS_DISABLE: + return rockchip_set_pull(bank, pin - bank->pin_base, param); + break; case PIN_CONFIG_BIAS_PULL_UP: case PIN_CONFIG_BIAS_PULL_DOWN: case PIN_CONFIG_BIAS_PULL_PIN_DEFAULT: + if (!rockchip_pinconf_pull_valid(info->ctrl, param)) + return -ENOTSUPP; + + if (!arg) + param = PIN_CONFIG_BIAS_DISABLE; + return rockchip_set_pull(bank, pin - bank->pin_base, param); break; default: @@ -600,12 +628,11 @@ static int rockchip_pinconf_get(struct pinctrl_dev *pctldev, unsigned int pin, case PIN_CONFIG_BIAS_PULL_UP: case PIN_CONFIG_BIAS_PULL_DOWN: case PIN_CONFIG_BIAS_PULL_PIN_DEFAULT: - pull = rockchip_get_pull(bank, pin - bank->pin_base); - - if (pull != param) - return -EINVAL; + if (!rockchip_pinconf_pull_valid(info->ctrl, param)) + return -ENOTSUPP; - *config = 0; + pull = rockchip_get_pull(bank, pin - bank->pin_base); + *config = (pull == param) ? 1 : 0; break; default: return -ENOTSUPP;
Change the rockchip pinctrl driver to handle the arguments of 0 or 1 to the pull pinconfig options correctly, so that the pull gets disabled when either the bias_disable options is set or the pull option has the argument 0. Signed-off-by: Heiko Stuebner <heiko@sntech.de> --- drivers/pinctrl/pinctrl-rockchip.c | 37 +++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-)