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

Unverified Commit 16646d8d authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'regulator-5.0' into regulator-5.1 stpmic1 const/range

parents e6fff62a 48593a99

drivers/regulator/axp20x-regulator.c

+6 −6
Original line number Diff line number Diff line
@@ -577,7 +577,7 @@ static const struct regulator_desc axp22x_regulators[] = { 
		 AXP22X_DCDC3_V_OUT, AXP22X_DCDC3_V_OUT_MASK,

		 AXP22X_PWR_OUT_CTRL1, AXP22X_PWR_OUT_DCDC3_MASK),

	AXP_DESC(AXP22X, DCDC4, "dcdc4", "vin4", 600, 1540, 20,

		 AXP22X_DCDC4_V_OUT, AXP22X_DCDC4_V_OUT,

		 AXP22X_DCDC4_V_OUT, AXP22X_DCDC4_V_OUT_MASK,

		 AXP22X_PWR_OUT_CTRL1, AXP22X_PWR_OUT_DCDC4_MASK),

	AXP_DESC(AXP22X, DCDC5, "dcdc5", "vin5", 1000, 2550, 50,

		 AXP22X_DCDC5_V_OUT, AXP22X_DCDC5_V_OUT_MASK,
@@ -795,7 +795,7 @@ static const struct regulator_desc axp806_regulators[] = { 
			AXP806_DCDCA_V_CTRL, AXP806_DCDCA_V_CTRL_MASK,

			AXP806_PWR_OUT_CTRL1, AXP806_PWR_OUT_DCDCA_MASK),

	AXP_DESC(AXP806, DCDCB, "dcdcb", "vinb", 1000, 2550, 50,

		 AXP806_DCDCB_V_CTRL, AXP806_DCDCB_V_CTRL,

		 AXP806_DCDCB_V_CTRL, AXP806_DCDCB_V_CTRL_MASK,

		 AXP806_PWR_OUT_CTRL1, AXP806_PWR_OUT_DCDCB_MASK),

	AXP_DESC_RANGES(AXP806, DCDCC, "dcdcc", "vinc",

			axp806_dcdca_ranges, AXP806_DCDCA_NUM_VOLTAGES,
@@ -821,7 +821,7 @@ static const struct regulator_desc axp806_regulators[] = { 
		 AXP806_BLDO1_V_CTRL, AXP806_BLDO1_V_CTRL_MASK,

		 AXP806_PWR_OUT_CTRL2, AXP806_PWR_OUT_BLDO1_MASK),

	AXP_DESC(AXP806, BLDO2, "bldo2", "bldoin", 700, 1900, 100,

		 AXP806_BLDO2_V_CTRL, AXP806_BLDO2_V_CTRL,

		 AXP806_BLDO2_V_CTRL, AXP806_BLDO2_V_CTRL_MASK,

		 AXP806_PWR_OUT_CTRL2, AXP806_PWR_OUT_BLDO2_MASK),

	AXP_DESC(AXP806, BLDO3, "bldo3", "bldoin", 700, 1900, 100,

		 AXP806_BLDO3_V_CTRL, AXP806_BLDO3_V_CTRL_MASK,
@@ -956,7 +956,7 @@ static const struct regulator_desc axp813_regulators[] = { 
		 AXP22X_ALDO1_V_OUT, AXP22X_ALDO1_V_OUT_MASK,

		 AXP22X_PWR_OUT_CTRL3, AXP806_PWR_OUT_ALDO1_MASK),

	AXP_DESC(AXP813, ALDO2, "aldo2", "aldoin", 700, 3300, 100,

		 AXP22X_ALDO2_V_OUT, AXP22X_ALDO2_V_OUT,

		 AXP22X_ALDO2_V_OUT, AXP22X_ALDO2_V_OUT_MASK,

		 AXP22X_PWR_OUT_CTRL3, AXP806_PWR_OUT_ALDO2_MASK),

	AXP_DESC(AXP813, ALDO3, "aldo3", "aldoin", 700, 3300, 100,

		 AXP22X_ALDO3_V_OUT, AXP22X_ALDO3_V_OUT_MASK,
@@ -966,7 +966,7 @@ static const struct regulator_desc axp813_regulators[] = { 
		 AXP22X_PWR_OUT_CTRL2, AXP22X_PWR_OUT_DLDO1_MASK),

	AXP_DESC_RANGES(AXP813, DLDO2, "dldo2", "dldoin",

			axp803_dldo2_ranges, AXP803_DLDO2_NUM_VOLTAGES,

			AXP22X_DLDO2_V_OUT, AXP22X_DLDO2_V_OUT,

			AXP22X_DLDO2_V_OUT, AXP22X_DLDO2_V_OUT_MASK,

			AXP22X_PWR_OUT_CTRL2, AXP22X_PWR_OUT_DLDO2_MASK),

	AXP_DESC(AXP813, DLDO3, "dldo3", "dldoin", 700, 3300, 100,

		 AXP22X_DLDO3_V_OUT, AXP22X_DLDO3_V_OUT_MASK,
@@ -981,7 +981,7 @@ static const struct regulator_desc axp813_regulators[] = { 
		 AXP22X_ELDO2_V_OUT, AXP22X_ELDO2_V_OUT_MASK,

		 AXP22X_PWR_OUT_CTRL2, AXP22X_PWR_OUT_ELDO2_MASK),

	AXP_DESC(AXP813, ELDO3, "eldo3", "eldoin", 700, 1900, 50,

		 AXP22X_ELDO3_V_OUT, AXP22X_ELDO3_V_OUT,

		 AXP22X_ELDO3_V_OUT, AXP22X_ELDO3_V_OUT_MASK,

		 AXP22X_PWR_OUT_CTRL2, AXP22X_PWR_OUT_ELDO3_MASK),

	/* to do / check ... */

	AXP_DESC(AXP813, FLDO1, "fldo1", "fldoin", 700, 1450, 50,

drivers/regulator/bcm590xx-regulator.c

+4 −0
Original line number Diff line number Diff line
@@ -242,8 +242,12 @@ static int bcm590xx_get_enable_register(int id) 
		case BCM590XX_REG_SDSR2:

			reg = BCM590XX_SDSR2PMCTRL1;

			break;

		case BCM590XX_REG_VSR:

			reg = BCM590XX_VSRPMCTRL1;

			break;

		case BCM590XX_REG_VBUS:

			reg = BCM590XX_OTG_CTRL;

			break;

		}

drivers/regulator/core.c

+3 −9
Original line number Diff line number Diff line
@@ -1337,7 +1337,9 @@ static int set_machine_constraints(struct regulator_dev *rdev, 
		 * We'll only apply the initial system load if an

		 * initial mode wasn't specified.

		 */

		regulator_lock(rdev);

		drms_uA_update(rdev);

		regulator_unlock(rdev);

	}



	if ((rdev->constraints->ramp_delay || rdev->constraints->ramp_disable)
@@ -2046,14 +2048,6 @@ static void _regulator_put(struct regulator *regulator) 
	debugfs_remove_recursive(regulator->debugfs);



	if (regulator->dev) {

		int count = 0;

		struct regulator *r;



		list_for_each_entry(r, &rdev->consumer_list, list)

			if (r->dev == regulator->dev)

				count++;



		if (count == 1)

		device_link_remove(regulator->dev, &rdev->dev);



		/* remove any sysfs entries */

drivers/regulator/da9052-regulator.c

+32 −32
Original line number Diff line number Diff line
@@ -290,10 +290,10 @@ static const struct regulator_ops da9052_ldo_ops = { 
	.disable = regulator_disable_regmap,

};



#define DA9052_LDO(_id, step, min, max, sbits, ebits, abits) \

#define DA9052_LDO(_id, _name, step, min, max, sbits, ebits, abits) \

{\

	.reg_desc = {\

		.name = #_id,\

		.name = #_name,\

		.ops = &da9052_ldo_ops,\

		.type = REGULATOR_VOLTAGE,\

		.id = DA9052_ID_##_id,\
@@ -310,10 +310,10 @@ static const struct regulator_ops da9052_ldo_ops = { 
	.activate_bit = (abits),\

}



#define DA9052_DCDC(_id, step, min, max, sbits, ebits, abits) \

#define DA9052_DCDC(_id, _name, step, min, max, sbits, ebits, abits) \

{\

	.reg_desc = {\

		.name = #_id,\

		.name = #_name,\

		.ops = &da9052_dcdc_ops,\

		.type = REGULATOR_VOLTAGE,\

		.id = DA9052_ID_##_id,\
@@ -331,37 +331,37 @@ static const struct regulator_ops da9052_ldo_ops = { 
}



static struct da9052_regulator_info da9052_regulator_info[] = {

	DA9052_DCDC(BUCK1, 25, 500, 2075, 6, 6, DA9052_SUPPLY_VBCOREGO),

	DA9052_DCDC(BUCK2, 25, 500, 2075, 6, 6, DA9052_SUPPLY_VBPROGO),

	DA9052_DCDC(BUCK3, 25, 950, 2525, 6, 6, DA9052_SUPPLY_VBMEMGO),

	DA9052_DCDC(BUCK4, 50, 1800, 3600, 5, 6, 0),

	DA9052_LDO(LDO1, 50, 600, 1800, 5, 6, 0),

	DA9052_LDO(LDO2, 25, 600, 1800, 6, 6, DA9052_SUPPLY_VLDO2GO),

	DA9052_LDO(LDO3, 25, 1725, 3300, 6, 6, DA9052_SUPPLY_VLDO3GO),

	DA9052_LDO(LDO4, 25, 1725, 3300, 6, 6, 0),

	DA9052_LDO(LDO5, 50, 1200, 3600, 6, 6, 0),

	DA9052_LDO(LDO6, 50, 1200, 3600, 6, 6, 0),

	DA9052_LDO(LDO7, 50, 1200, 3600, 6, 6, 0),

	DA9052_LDO(LDO8, 50, 1200, 3600, 6, 6, 0),

	DA9052_LDO(LDO9, 50, 1250, 3650, 6, 6, 0),

	DA9052_LDO(LDO10, 50, 1200, 3600, 6, 6, 0),

	DA9052_DCDC(BUCK1, buck1, 25, 500, 2075, 6, 6, DA9052_SUPPLY_VBCOREGO),

	DA9052_DCDC(BUCK2, buck2, 25, 500, 2075, 6, 6, DA9052_SUPPLY_VBPROGO),

	DA9052_DCDC(BUCK3, buck3, 25, 950, 2525, 6, 6, DA9052_SUPPLY_VBMEMGO),

	DA9052_DCDC(BUCK4, buck4, 50, 1800, 3600, 5, 6, 0),

	DA9052_LDO(LDO1, ldo1, 50, 600, 1800, 5, 6, 0),

	DA9052_LDO(LDO2, ldo2, 25, 600, 1800, 6, 6, DA9052_SUPPLY_VLDO2GO),

	DA9052_LDO(LDO3, ldo3, 25, 1725, 3300, 6, 6, DA9052_SUPPLY_VLDO3GO),

	DA9052_LDO(LDO4, ldo4, 25, 1725, 3300, 6, 6, 0),

	DA9052_LDO(LDO5, ldo5, 50, 1200, 3600, 6, 6, 0),

	DA9052_LDO(LDO6, ldo6, 50, 1200, 3600, 6, 6, 0),

	DA9052_LDO(LDO7, ldo7, 50, 1200, 3600, 6, 6, 0),

	DA9052_LDO(LDO8, ldo8, 50, 1200, 3600, 6, 6, 0),

	DA9052_LDO(LDO9, ldo9, 50, 1250, 3650, 6, 6, 0),

	DA9052_LDO(LDO10, ldo10, 50, 1200, 3600, 6, 6, 0),

};



static struct da9052_regulator_info da9053_regulator_info[] = {

	DA9052_DCDC(BUCK1, 25, 500, 2075, 6, 6, DA9052_SUPPLY_VBCOREGO),

	DA9052_DCDC(BUCK2, 25, 500, 2075, 6, 6, DA9052_SUPPLY_VBPROGO),

	DA9052_DCDC(BUCK3, 25, 950, 2525, 6, 6, DA9052_SUPPLY_VBMEMGO),

	DA9052_DCDC(BUCK4, 25, 950, 2525, 6, 6, 0),

	DA9052_LDO(LDO1, 50, 600, 1800, 5, 6, 0),

	DA9052_LDO(LDO2, 25, 600, 1800, 6, 6, DA9052_SUPPLY_VLDO2GO),

	DA9052_LDO(LDO3, 25, 1725, 3300, 6, 6, DA9052_SUPPLY_VLDO3GO),

	DA9052_LDO(LDO4, 25, 1725, 3300, 6, 6, 0),

	DA9052_LDO(LDO5, 50, 1200, 3600, 6, 6, 0),

	DA9052_LDO(LDO6, 50, 1200, 3600, 6, 6, 0),

	DA9052_LDO(LDO7, 50, 1200, 3600, 6, 6, 0),

	DA9052_LDO(LDO8, 50, 1200, 3600, 6, 6, 0),

	DA9052_LDO(LDO9, 50, 1250, 3650, 6, 6, 0),

	DA9052_LDO(LDO10, 50, 1200, 3600, 6, 6, 0),

	DA9052_DCDC(BUCK1, buck1, 25, 500, 2075, 6, 6, DA9052_SUPPLY_VBCOREGO),

	DA9052_DCDC(BUCK2, buck2, 25, 500, 2075, 6, 6, DA9052_SUPPLY_VBPROGO),

	DA9052_DCDC(BUCK3, buck3, 25, 950, 2525, 6, 6, DA9052_SUPPLY_VBMEMGO),

	DA9052_DCDC(BUCK4, buck4, 25, 950, 2525, 6, 6, 0),

	DA9052_LDO(LDO1, ldo1, 50, 600, 1800, 5, 6, 0),

	DA9052_LDO(LDO2, ldo2, 25, 600, 1800, 6, 6, DA9052_SUPPLY_VLDO2GO),

	DA9052_LDO(LDO3, ldo3, 25, 1725, 3300, 6, 6, DA9052_SUPPLY_VLDO3GO),

	DA9052_LDO(LDO4, ldo4, 25, 1725, 3300, 6, 6, 0),

	DA9052_LDO(LDO5, ldo5, 50, 1200, 3600, 6, 6, 0),

	DA9052_LDO(LDO6, ldo6, 50, 1200, 3600, 6, 6, 0),

	DA9052_LDO(LDO7, ldo7, 50, 1200, 3600, 6, 6, 0),

	DA9052_LDO(LDO8, ldo8, 50, 1200, 3600, 6, 6, 0),

	DA9052_LDO(LDO9, ldo9, 50, 1250, 3650, 6, 6, 0),

	DA9052_LDO(LDO10, ldo10, 50, 1200, 3600, 6, 6, 0),

};



static inline struct da9052_regulator_info *find_regulator_info(u8 chip_id,

drivers/regulator/lochnagar-regulator.c

+2 −2
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ static const struct regulator_desc lochnagar_regulators[] = { 
		.name = "VDDCORE",

		.supply_name = "SYSVDD",

		.type = REGULATOR_VOLTAGE,

		.n_voltages = 57,

		.n_voltages = 66,

		.ops = &lochnagar_vddcore_ops,



		.id = LOCHNAGAR_VDDCORE,
@@ -226,7 +226,7 @@ static const struct of_device_id lochnagar_of_match[] = { 
	},

	{

		.compatible = "cirrus,lochnagar2-mic2vdd",

		.data = &lochnagar_regulators[LOCHNAGAR_MIC1VDD],

		.data = &lochnagar_regulators[LOCHNAGAR_MIC2VDD],

	},

	{

		.compatible = "cirrus,lochnagar2-vddcore",