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

Unverified Commit e6fff62a authored by Pascal PAILLET-LME's avatar Pascal PAILLET-LME Committed by Mark Brown
Browse files

regulator: stpmic1: Add active discharge support 



Add support for active discharge for USB power switches.

Signed-off-by: default avatarpascal paillet <p.paillet@st.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 714a74f1

drivers/regulator/stpmic1_regulator.c

+55 −13
Original line number Diff line number Diff line
@@ -176,11 +176,19 @@ static const struct regulator_ops stpmic1_vref_ddr_ops = { 
	.disable = regulator_disable_regmap,

};



static const struct regulator_ops stpmic1_boost_regul_ops = {

	.is_enabled = regulator_is_enabled_regmap,

	.enable = regulator_enable_regmap,

	.disable = regulator_disable_regmap,

	.set_over_current_protection = stpmic1_set_icc,

};



static const struct regulator_ops stpmic1_switch_regul_ops = {

	.is_enabled = regulator_is_enabled_regmap,

	.enable = regulator_enable_regmap,

	.disable = regulator_disable_regmap,

	.set_over_current_protection = stpmic1_set_icc,

	.set_active_discharge = regulator_set_active_discharge_regmap,

};



#define REG_LDO(ids, base) { \
@@ -281,7 +289,44 @@ static const struct regulator_ops stpmic1_switch_regul_ops = { 
	.supply_name = #base, \

}



#define REG_SWITCH(ids, base, reg, mask, val) { \

#define REG_BOOST(ids, base) { \

	.name = #ids, \

	.id = STPMIC1_##ids, \

	.n_voltages = 1, \

	.ops = &stpmic1_boost_regul_ops, \

	.type = REGULATOR_VOLTAGE, \

	.owner = THIS_MODULE, \

	.min_uV = 0, \

	.fixed_uV = 5000000, \

	.enable_reg = BST_SW_CR, \

	.enable_mask = BOOST_ENABLED, \

	.enable_val = BOOST_ENABLED, \

	.disable_val = 0, \

	.enable_time = PMIC_ENABLE_TIME_US, \

	.supply_name = #base, \

}



#define REG_VBUS_OTG(ids, base) { \

	.name = #ids, \

	.id = STPMIC1_##ids, \

	.n_voltages = 1, \

	.ops = &stpmic1_switch_regul_ops, \

	.type = REGULATOR_VOLTAGE, \

	.owner = THIS_MODULE, \

	.min_uV = 0, \

	.fixed_uV = 5000000, \

	.enable_reg = BST_SW_CR, \

	.enable_mask = USBSW_OTG_SWITCH_ENABLED, \

	.enable_val = USBSW_OTG_SWITCH_ENABLED, \

	.disable_val = 0, \

	.enable_time = PMIC_ENABLE_TIME_US, \

	.supply_name = #base, \

	.active_discharge_reg = BST_SW_CR, \

	.active_discharge_mask = VBUS_OTG_DISCHARGE, \

	.active_discharge_on = VBUS_OTG_DISCHARGE, \

}



#define REG_SW_OUT(ids, base) { \

	.name = #ids, \

	.id = STPMIC1_##ids, \

	.n_voltages = 1, \
@@ -290,12 +335,15 @@ static const struct regulator_ops stpmic1_switch_regul_ops = { 
	.owner = THIS_MODULE, \

	.min_uV = 0, \

	.fixed_uV = 5000000, \

	.enable_reg = (reg), \

	.enable_mask = (mask), \

	.enable_val = (val), \

	.enable_reg = BST_SW_CR, \

	.enable_mask = SWIN_SWOUT_ENABLED, \

	.enable_val = SWIN_SWOUT_ENABLED, \

	.disable_val = 0, \

	.enable_time = PMIC_ENABLE_TIME_US, \

	.supply_name = #base, \

	.active_discharge_reg = BST_SW_CR, \

	.active_discharge_mask = SW_OUT_DISCHARGE, \

	.active_discharge_on = SW_OUT_DISCHARGE, \

}



static const struct stpmic1_regulator_cfg stpmic1_regulator_cfgs[] = {
@@ -375,23 +423,17 @@ static const struct stpmic1_regulator_cfg stpmic1_regulator_cfgs[] = { 
		.mask_reset_mask = BIT(6),

	},

	[STPMIC1_BOOST] = {

		.desc = REG_SWITCH(BOOST, boost, BST_SW_CR,

				   BOOST_ENABLED,

				   BOOST_ENABLED),

		.desc = REG_BOOST(BOOST, boost),

		.icc_reg = BUCKS_ICCTO_CR,

		.icc_mask = BIT(6),

	},

	[STPMIC1_VBUS_OTG] = {

		.desc = REG_SWITCH(VBUS_OTG, pwr_sw1, BST_SW_CR,

				   USBSW_OTG_SWITCH_ENABLED,

				   USBSW_OTG_SWITCH_ENABLED),

		.desc = REG_VBUS_OTG(VBUS_OTG, pwr_sw1),

		.icc_reg = BUCKS_ICCTO_CR,

		.icc_mask = BIT(4),

	},

	[STPMIC1_SW_OUT] = {

		.desc = REG_SWITCH(SW_OUT, pwr_sw2, BST_SW_CR,

				   SWIN_SWOUT_ENABLED,

				   SWIN_SWOUT_ENABLED),

		.desc = REG_SW_OUT(SW_OUT, pwr_sw2),

		.icc_reg = BUCKS_ICCTO_CR,

		.icc_mask = BIT(5),

	},