diff options
| author | Fenglin Wu | 2017-09-12 02:32:46 +0200 |
|---|---|---|
| committer | Linus Walleij | 2017-10-11 10:23:35 +0200 |
| commit | 6cb74f444364c2f05ef21e84b22c82ebcd116131 (patch) | |
| tree | 72bed2cfe24908fdfcac6eba532e47f46f91f82f | |
| parent | pinctrl: mcp23s08: remove unused variables from pinconf_set (diff) | |
| download | kernel-qcow2-linux-6cb74f444364c2f05ef21e84b22c82ebcd116131.tar.gz kernel-qcow2-linux-6cb74f444364c2f05ef21e84b22c82ebcd116131.tar.xz kernel-qcow2-linux-6cb74f444364c2f05ef21e84b22c82ebcd116131.zip | |
pinctrl: qcom: spmi-gpio: Update GPIO EN_CTL when setting pin config
GPIO is expected to be disabled iff PIN_CONFIG_BIAS_HIGH_IMPEDANCE is
configured. Update is_enabled flag in config_set() so that it can
reflect GPIO status correctly. Also modify EN_CTL register based on
is_enabled flag in config_set() to configure the GPIO properly.
Signed-off-by: Fenglin Wu <fenglinw@codeaurora.org>
Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| -rw-r--r-- | drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c index c2c0bab04257..a0edaa85f22b 100644 --- a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c +++ b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c @@ -453,6 +453,7 @@ static int pmic_gpio_config_set(struct pinctrl_dev *pctldev, unsigned int pin, pad = pctldev->desc->pins[pin].drv_data; + pad->is_enabled = true; for (i = 0; i < nconfs; i++) { param = pinconf_to_config_param(configs[i]); arg = pinconf_to_config_argument(configs[i]); @@ -600,6 +601,10 @@ static int pmic_gpio_config_set(struct pinctrl_dev *pctldev, unsigned int pin, return ret; } + val = pad->is_enabled << PMIC_GPIO_REG_MASTER_EN_SHIFT; + + ret = pmic_gpio_write(state, pad, PMIC_GPIO_REG_EN_CTL, val); + return ret; } |