Explorar el Código

pinctrl: qcom-spmi-gpio: Fix output type configuration

GPIO output type configuration was incorrectly overwritten
by strength value. Fix this.

Signed-off-by: Ivan T. Ivanov <ivan.ivanov@linaro.org>
Acked-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Ivan T. Ivanov hace 10 años
padre
commit
982df6aec0
Se han modificado 1 ficheros con 1 adiciones y 1 borrados
  1. 1 1
      drivers/pinctrl/qcom/pinctrl-spmi-gpio.c

+ 1 - 1
drivers/pinctrl/qcom/pinctrl-spmi-gpio.c

@@ -417,7 +417,7 @@ static int pmic_gpio_config_set(struct pinctrl_dev *pctldev, unsigned int pin,
 		return ret;
 
 	val = pad->buffer_type << PMIC_GPIO_REG_OUT_TYPE_SHIFT;
-	val = pad->strength << PMIC_GPIO_REG_OUT_STRENGTH_SHIFT;
+	val |= pad->strength << PMIC_GPIO_REG_OUT_STRENGTH_SHIFT;
 
 	ret = pmic_gpio_write(state, pad, PMIC_GPIO_REG_DIG_OUT_CTL, val);
 	if (ret < 0)