From: Fenglin Wu <fengl...@codeaurora.org>

Get initial value of is_enabled flag by reading REG_EN_CTL register
so that it can reflect the correct hardware enable state before
setting pin config.

Signed-off-by: Fenglin Wu <fengl...@codeaurora.org>
---
 drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c 
b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
index a0edaa8..0a1e173 100644
--- a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
+++ b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
@@ -106,6 +106,7 @@
 
 /* PMIC_GPIO_REG_EN_CTL */
 #define PMIC_GPIO_REG_MASTER_EN_SHIFT          7
+#define PMIC_GPIO_REG_MASTER_EN                        0x80
 
 #define PMIC_GPIO_PHYSICAL_OFFSET              1
 
@@ -914,8 +915,12 @@ static int pmic_gpio_populate(struct pmic_gpio_state 
*state,
                pad->atest = (val & PMIC_GPIO_LV_MV_ANA_MUX_SEL_MASK) + 1;
        }
 
-       /* Pin could be disabled with PIN_CONFIG_BIAS_HIGH_IMPEDANCE */
-       pad->is_enabled = true;
+       val = pmic_gpio_read(state, pad, PMIC_GPIO_REG_EN_CTL);
+       if (val < 0)
+               return val;
+
+       pad->is_enabled = val & PMIC_GPIO_REG_MASTER_EN;
+
        return 0;
 }
 
-- 
Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project.

Reply via email to