pinctrl: qcom-spmi: Fix pin direction configuration

Pin direction configuration was incorrectly overwritten
by output and function values in set_mux(). Fix this.

Signed-off-by: Ivan T. Ivanov <ivan.ivanov@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

2 files changed, 2 insertions, 0 deletions

diff --git a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
index b2d22218a258..de684ca93b5a 100644
--- a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
+++ b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
@@ -260,6 +260,7 @@ static int pmic_gpio_set_mux(struct pinctrl_dev *pctldev, unsigned function,
                         val = 1;
         }
 
+        val = val << PMIC_GPIO_REG_MODE_DIR_SHIFT;
         val |= pad->function << PMIC_GPIO_REG_MODE_FUNCTION_SHIFT;
         val |= pad->out_value & PMIC_GPIO_REG_MODE_VALUE_SHIFT;
 
diff --git a/drivers/pinctrl/qcom/pinctrl-spmi-mpp.c b/drivers/pinctrl/qcom/pinctrl-spmi-mpp.c
index 8f36c5f91949..890df16353b3 100644
--- a/drivers/pinctrl/qcom/pinctrl-spmi-mpp.c
+++ b/drivers/pinctrl/qcom/pinctrl-spmi-mpp.c
@@ -370,6 +370,7 @@ static int pmic_mpp_set_mux(struct pinctrl_dev *pctldev, unsigned function,
                 }
         }
 
+        val = val << PMIC_MPP_REG_MODE_DIR_SHIFT;
         val |= pad->function << PMIC_MPP_REG_MODE_FUNCTION_SHIFT;
         val |= pad->out_value & PMIC_MPP_REG_MODE_VALUE_MASK;