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

Commit 5059309c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "pinctrl: qcom: spmi-gpio: Update GPIO EN_CTL when setting pin config"

parents 9e700121 eeb73e82

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

+6 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2012-2014, 2016 The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2014, 2016-2017 The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -471,6 +471,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]);
@@ -619,6 +620,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;

}