mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 06:10:56 +00:00
pinctrl: ssbi-gpio: Fix pm8xxx_pin_config_get() to be compliant
[ Upstream commitb432414b99
] If you look at "pinconf-groups" in debugfs for ssbi-gpio you'll notice it looks like nonsense. The problem is fairly well described in commit1cf86bc212
("pinctrl: qcom: spmi-gpio: Fix pmic_gpio_config_get() to be compliant") and commit05e0c82895
("pinctrl: msm: Fix msm_config_group_get() to be compliant"), but it was pointed out that ssbi-gpio has the same problem. Let's fix it there too. Fixes:b4c45fe974
("pinctrl: qcom: ssbi: Family A gpio & mpp drivers") Signed-off-by: Douglas Anderson <dianders@chromium.org> Reviewed-by: Stephen Boyd <sboyd@kernel.org> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
3b95f64912
commit
989335821b
1 changed files with 21 additions and 7 deletions
|
@ -260,22 +260,32 @@ static int pm8xxx_pin_config_get(struct pinctrl_dev *pctldev,
|
|||
|
||||
switch (param) {
|
||||
case PIN_CONFIG_BIAS_DISABLE:
|
||||
arg = pin->bias == PM8XXX_GPIO_BIAS_NP;
|
||||
if (pin->bias != PM8XXX_GPIO_BIAS_NP)
|
||||
return -EINVAL;
|
||||
arg = 1;
|
||||
break;
|
||||
case PIN_CONFIG_BIAS_PULL_DOWN:
|
||||
arg = pin->bias == PM8XXX_GPIO_BIAS_PD;
|
||||
if (pin->bias != PM8XXX_GPIO_BIAS_PD)
|
||||
return -EINVAL;
|
||||
arg = 1;
|
||||
break;
|
||||
case PIN_CONFIG_BIAS_PULL_UP:
|
||||
arg = pin->bias <= PM8XXX_GPIO_BIAS_PU_1P5_30;
|
||||
if (pin->bias > PM8XXX_GPIO_BIAS_PU_1P5_30)
|
||||
return -EINVAL;
|
||||
arg = 1;
|
||||
break;
|
||||
case PM8XXX_QCOM_PULL_UP_STRENGTH:
|
||||
arg = pin->pull_up_strength;
|
||||
break;
|
||||
case PIN_CONFIG_BIAS_HIGH_IMPEDANCE:
|
||||
arg = pin->disable;
|
||||
if (!pin->disable)
|
||||
return -EINVAL;
|
||||
arg = 1;
|
||||
break;
|
||||
case PIN_CONFIG_INPUT_ENABLE:
|
||||
arg = pin->mode == PM8XXX_GPIO_MODE_INPUT;
|
||||
if (pin->mode != PM8XXX_GPIO_MODE_INPUT)
|
||||
return -EINVAL;
|
||||
arg = 1;
|
||||
break;
|
||||
case PIN_CONFIG_OUTPUT:
|
||||
if (pin->mode & PM8XXX_GPIO_MODE_OUTPUT)
|
||||
|
@ -290,10 +300,14 @@ static int pm8xxx_pin_config_get(struct pinctrl_dev *pctldev,
|
|||
arg = pin->output_strength;
|
||||
break;
|
||||
case PIN_CONFIG_DRIVE_PUSH_PULL:
|
||||
arg = !pin->open_drain;
|
||||
if (pin->open_drain)
|
||||
return -EINVAL;
|
||||
arg = 1;
|
||||
break;
|
||||
case PIN_CONFIG_DRIVE_OPEN_DRAIN:
|
||||
arg = pin->open_drain;
|
||||
if (!pin->open_drain)
|
||||
return -EINVAL;
|
||||
arg = 1;
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
|
|
Loading…
Reference in a new issue