Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6ae1e7b authored by Douglas Anderson's avatar Douglas Anderson Committed by Greg Kroah-Hartman
Browse files

pinctrl: ssbi-gpio: Fix pm8xxx_pin_config_get() to be compliant 



[ Upstream commit b432414b996d32a1bd9afe2bd595bd5729c1477f ]

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 commit 1cf86bc2 ("pinctrl:
qcom: spmi-gpio: Fix pmic_gpio_config_get() to be compliant") and
commit 05e0c828 ("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: b4c45fe9 ("pinctrl: qcom: ssbi: Family A gpio & mpp drivers")
Signed-off-by: default avatarDouglas Anderson <dianders@chromium.org>
Reviewed-by: default avatarStephen Boyd <sboyd@kernel.org>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a87aba15

drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c

+21 −7
Original line number Diff line number Diff line
@@ -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;