Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-21 02:21:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

pinctrl: msm: Fix msm_config_group_get() to be compliant

Browse Source 
If you do this on an sdm845 board:
  cat /sys/kernel/debug/pinctrl/3400000.pinctrl/pinconf-groups

...it looks like nonsense.  For every pin you see listed:
  input bias bus hold, input bias disabled, input bias pull down, input bias pull up

That's because msm_config_group_get() isn't complying with the rules
that pinconf_generic_dump_one() expects.  Specifically for boolean
parameters (anything with a "struct pin_config_item" where has_arg is
false) the function expects that the function should return its value
not through the "config" parameter but should return "0" if the value
is set and "-EINVAL" if the value isn't set.

Let's fix this.

From a quick sample of other pinctrl drivers, it appears to be
tradition to also return 1 through the config parameter for these
boolean parameters when they exist.  I'm not one to knock tradition,
so I'll follow tradition and return 1 in these cases.  While I'm at
it, I'll also continue searching for four leaf clovers, kocking on
wood three times, and trying not to break mirrors.

Fixes: f365be0925 ("pinctrl: Add Qualcomm TLMM driver")
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Douglas Anderson 2018-07-02 15:59:38 -07:00 committed by Linus Walleij
parent 63f3fb8d7c
commit 05e0c82895
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/pinctrl/qcom/pinctrl-msm.c
View File

@ -250,22 +250,30 @@ static int msm_config_group_get(struct pinctrl_dev *pctldev,
/* Convert register value to pinconf value */ /* Convert register value to pinconf value */
switch (param) { switch (param) {
case PIN_CONFIG_BIAS_DISABLE: case PIN_CONFIG_BIAS_DISABLE:
arg = arg == MSM_NO_PULL; if (arg != MSM_NO_PULL)
return -EINVAL;
arg = 1;
break; break;
case PIN_CONFIG_BIAS_PULL_DOWN: case PIN_CONFIG_BIAS_PULL_DOWN:
arg = arg == MSM_PULL_DOWN; if (arg != MSM_PULL_DOWN)
return -EINVAL;
arg = 1;
break; break;
case PIN_CONFIG_BIAS_BUS_HOLD: case PIN_CONFIG_BIAS_BUS_HOLD:
if (pctrl->soc->pull_no_keeper) if (pctrl->soc->pull_no_keeper)
return -ENOTSUPP; return -ENOTSUPP;
arg = arg == MSM_KEEPER; if (arg != MSM_KEEPER)
return -EINVAL;
arg = 1;
break; break;
case PIN_CONFIG_BIAS_PULL_UP: case PIN_CONFIG_BIAS_PULL_UP:
if (pctrl->soc->pull_no_keeper) if (pctrl->soc->pull_no_keeper)
arg = arg == MSM_PULL_UP_NO_KEEPER; arg = arg == MSM_PULL_UP_NO_KEEPER;
else else
arg = arg == MSM_PULL_UP; arg = arg == MSM_PULL_UP;
if (!arg)
return -EINVAL;
break; break;
case PIN_CONFIG_DRIVE_STRENGTH: case PIN_CONFIG_DRIVE_STRENGTH:
arg = msm_regval_to_drive(arg); arg = msm_regval_to_drive(arg);