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

Commit 9210f05b authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

regulator: Fix da9052 ldo regulator names 



The regulator name for LDOs are LDO4 ... LDO13 in current implementation.
The correct regulator name for LDOs should be LDO1 ... LDO10.

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 7061873f

drivers/regulator/da9052-regulator.c

+52 −40
Original line number Diff line number Diff line
@@ -37,6 +37,22 @@ 
#define DA9052_BUCK_ILIM_MASK_EVEN	0x0c

#define DA9052_BUCK_ILIM_MASK_ODD	0xc0



/* DA9052 REGULATOR IDs */

#define DA9052_ID_BUCK1		0

#define DA9052_ID_BUCK2		1

#define DA9052_ID_BUCK3		2

#define DA9052_ID_BUCK4		3

#define DA9052_ID_LDO1		4

#define DA9052_ID_LDO2		5

#define DA9052_ID_LDO3		6

#define DA9052_ID_LDO4		7

#define DA9052_ID_LDO5		8

#define DA9052_ID_LDO6		9

#define DA9052_ID_LDO7		10

#define DA9052_ID_LDO8		11

#define DA9052_ID_LDO9		12

#define DA9052_ID_LDO10		13



static const u32 da9052_current_limits[3][4] = {

	{700000, 800000, 1000000, 1200000},	/* DA9052-BC BUCKs */

	{1600000, 2000000, 2400000, 3000000},	/* DA9053-AA/Bx BUCK-CORE */
@@ -396,10 +412,10 @@ static struct regulator_ops da9052_ldo_ops = { 
#define DA9052_LDO5_6(_id, step, min, max, sbits, ebits, abits) \

{\

	.reg_desc = {\

		.name = "LDO" #_id,\

		.name = #_id,\

		.ops = &da9052_ldo5_6_ops,\

		.type = REGULATOR_VOLTAGE,\

		.id = _id,\

		.id = DA9052_ID_##_id,\

		.n_voltages = (max - min) / step + 1, \

		.owner = THIS_MODULE,\

	},\
@@ -414,10 +430,10 @@ static struct regulator_ops da9052_ldo_ops = { 
#define DA9052_LDO(_id, step, min, max, sbits, ebits, abits) \

{\

	.reg_desc = {\

		.name = "LDO" #_id,\

		.name = #_id,\

		.ops = &da9052_ldo_ops,\

		.type = REGULATOR_VOLTAGE,\

		.id = _id,\

		.id = DA9052_ID_##_id,\

		.n_voltages = (max - min) / step + 1, \

		.owner = THIS_MODULE,\

	},\
@@ -432,10 +448,10 @@ static struct regulator_ops da9052_ldo_ops = { 
#define DA9052_DCDC(_id, step, min, max, sbits, ebits, abits) \

{\

	.reg_desc = {\

		.name = "BUCK" #_id,\

		.name = #_id,\

		.ops = &da9052_dcdc_ops,\

		.type = REGULATOR_VOLTAGE,\

		.id = _id,\

		.id = DA9052_ID_##_id,\

		.n_voltages = (max - min) / step + 1, \

		.owner = THIS_MODULE,\

	},\
@@ -450,10 +466,10 @@ static struct regulator_ops da9052_ldo_ops = { 
#define DA9052_BUCKPERI(_id, step, min, max, sbits, ebits, abits) \

{\

	.reg_desc = {\

		.name = "BUCK" #_id,\

		.name = #_id,\

		.ops = &da9052_buckperi_ops,\

		.type = REGULATOR_VOLTAGE,\

		.id = _id,\

		.id = DA9052_ID_##_id,\

		.n_voltages = (max - min) / step + 1, \

		.owner = THIS_MODULE,\

	},\
@@ -466,41 +482,37 @@ static struct regulator_ops da9052_ldo_ops = { 
}



static struct da9052_regulator_info da9052_regulator_info[] = {

	/* Buck1 - 4 */

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

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

	DA9052_DCDC(2, 25, 925, 2500, 6, 6, DA9052_SUPPLY_VBMEMGO),

	DA9052_BUCKPERI(3, 50, 1800, 3600, 5, 6, 0),

	/* LD01 - LDO10 */

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

	DA9052_LDO5_6(5, 25, 600, 1800, 6, 6, DA9052_SUPPLY_VLDO2GO),

	DA9052_LDO5_6(6, 25, 1725, 3300, 6, 6, DA9052_SUPPLY_VLDO3GO),

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

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

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

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

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

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

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

	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, 925, 2500, 6, 6, DA9052_SUPPLY_VBMEMGO),

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

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

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

	DA9052_LDO5_6(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),

};



static struct da9052_regulator_info da9053_regulator_info[] = {

	/* Buck1 - 4 */

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

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

	DA9052_DCDC(2, 25, 925, 2500, 6, 6, DA9052_SUPPLY_VBMEMGO),

	DA9052_BUCKPERI(3, 25, 925, 2500, 6, 6, 0),

	/* LD01 - LDO10 */

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

	DA9052_LDO5_6(5, 25, 600, 1800, 6, 6, DA9052_SUPPLY_VLDO2GO),

	DA9052_LDO5_6(6, 25, 1725, 3300, 6, 6, DA9052_SUPPLY_VLDO3GO),

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

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

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

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

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

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

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

	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, 925, 2500, 6, 6, DA9052_SUPPLY_VBMEMGO),

	DA9052_BUCKPERI(BUCK4, 25, 925, 2500, 6, 6, 0),

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

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

	DA9052_LDO5_6(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),

};



static inline struct da9052_regulator_info *find_regulator_info(u8 chip_id,