Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc391502 authored by Ivan T. Ivanov's avatar Ivan T. Ivanov Committed by Linus Walleij
Browse files

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: default avatarIvan T. Ivanov <ivan.ivanov@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent a526973e

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -260,6 +260,7 @@ static int pmic_gpio_set_mux(struct pinctrl_dev *pctldev, unsigned function, 
			val = 1;

			val = 1;

	}

	}





	val = val << PMIC_GPIO_REG_MODE_DIR_SHIFT;

	val |= pad->function << PMIC_GPIO_REG_MODE_FUNCTION_SHIFT;

	val |= pad->function << PMIC_GPIO_REG_MODE_FUNCTION_SHIFT;

	val |= pad->out_value & PMIC_GPIO_REG_MODE_VALUE_SHIFT;

	val |= pad->out_value & PMIC_GPIO_REG_MODE_VALUE_SHIFT;

drivers/pinctrl/qcom/pinctrl-spmi-mpp.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -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->function << PMIC_MPP_REG_MODE_FUNCTION_SHIFT;

	val |= pad->out_value & PMIC_MPP_REG_MODE_VALUE_MASK;

	val |= pad->out_value & PMIC_MPP_REG_MODE_VALUE_MASK;