Merge tag 'pinctrl-v4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[sfrench/cifs-2.6.git] / drivers / pinctrl / qcom / pinctrl-spmi-gpio.c

diff --git a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
index c2c0bab04257dfdd3d5d118d043f7928b94be3dc..3e66e0d1001070c5925512228766c659fd07d2de 100644 (file)
--- 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;
 }
 
@@ -1032,6 +1037,7 @@ static const struct of_device_id pmic_gpio_of_match[] = {
        { .compatible = "qcom,pm8916-gpio" },   /* 4 GPIO's */
        { .compatible = "qcom,pm8941-gpio" },   /* 36 GPIO's */
        { .compatible = "qcom,pm8994-gpio" },   /* 22 GPIO's */
+       { .compatible = "qcom,pmi8994-gpio" },  /* 10 GPIO's */
        { .compatible = "qcom,pma8084-gpio" },  /* 22 GPIO's */
        { .compatible = "qcom,spmi-gpio" }, /* Generic */
        { },