Merge "pinctrl: qcom: spmi-gpio: Fix a bug in pmic_gpio_config_set" (350424d9) · Commits · e / devices / android_kernel_fairphone_FP3

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

+8 −8

Original line number	Diff line number	Diff line
		@@ -569,14 +569,6 @@ static int pmic_gpio_config_set(struct pinctrl_dev *pctldev, unsigned int pin,
		if (ret < 0)
		return ret;

		val = PMIC_GPIO_MODE_DIGITAL_INPUT;
		if (pad->output_enabled) {
		if (pad->input_enabled)
		val = PMIC_GPIO_MODE_DIGITAL_INPUT_OUTPUT;
		else
		val = PMIC_GPIO_MODE_DIGITAL_OUTPUT;
		}

		if (pad->dtest_buffer != INT_MAX) {
		val = pad->dtest_buffer;
		if (pad->lv_mv_type)
		@@ -588,6 +580,14 @@ static int pmic_gpio_config_set(struct pinctrl_dev *pctldev, unsigned int pin,
		return ret;
		}

		val = PMIC_GPIO_MODE_DIGITAL_INPUT;
		if (pad->output_enabled) {
		if (pad->input_enabled)
		val = PMIC_GPIO_MODE_DIGITAL_INPUT_OUTPUT;
		else
		val = PMIC_GPIO_MODE_DIGITAL_OUTPUT;
		}

		if (pad->lv_mv_type) {
		if (pad->function == PMIC_GPIO_FUNC_INDEX_ANALOG) {
		val = PMIC_GPIO_MODE_ANALOG_PASS_THRU;