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

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

regulator: Fix n_voltage settings for pcf50633 regulator 



Current code has off-by-one n_voltage settings for AUTO/DOWN*/LDO* regulators.

Take ldo1 as example:
n_voltage should be (3.6 - 0.9) / 0.1 + 1 = 28

Table 76. LDO1OUT - LDO1 output voltage select register (address 2Dh) bit description[1]
Bit Symbol Access Description
4:0 ldo1_out R/W VO(prog) = 0.9 + ldo1_out × 0.1 V (max 3.6V); e.g.
00000 : 0.9 V
00001 : 1.0 V
11000 : 3.3 V
11011 : 3.6 V
11111 : 3.6 V

The n_voltage settings for HCLDO and MEMLDO are also wrong.
n_voltage for HCLDO and MEMLDO should be (3.6 - 0.9) / 0.1 + 1 = 28

Table 88. HCLDOOUT - HCLDO output voltage select register (addr. 39h) bit description[1]
Bit Symbol Access Description
4:0 hcldo_out R/W VO(prog) = 0.9 + hcldo_out × 0.1 V (max 3.6 V); e.g.
00000 : 0.9 V
00001 : 1.0 V
11011 : 3.6 V
11111 : 3.6 V

Table 62. MEMLDOOUT - MEMLDO o/p voltage select reg. (address 26h) bit description[1]
Bit Symbol Access Description
4:0 memldo_out R/W VO(prog) = 0.9 + memldo_out × 0.1 V; e.g.
00000: 0.9 V
00001: 1.0 V
11000 : 3.3 V
11011 : 3.6 V
11111 : 3.6 V

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

drivers/regulator/pcf50633-regulator.c

+13 −14
Original line number Original line Diff line number Diff line
@@ -142,6 +142,7 @@ static int pcf50633_regulator_set_voltage(struct regulator_dev *rdev, 
	case PCF50633_REGULATOR_LDO5:

	case PCF50633_REGULATOR_LDO5:

	case PCF50633_REGULATOR_LDO6:

	case PCF50633_REGULATOR_LDO6:

	case PCF50633_REGULATOR_HCLDO:

	case PCF50633_REGULATOR_HCLDO:

	case PCF50633_REGULATOR_MEMLDO:

		volt_bits = ldo_voltage_bits(millivolts);

		volt_bits = ldo_voltage_bits(millivolts);

		break;

		break;

	default:

	default:
@@ -175,6 +176,7 @@ static int pcf50633_regulator_voltage_value(enum pcf50633_regulator_id id, 
	case PCF50633_REGULATOR_LDO5:

	case PCF50633_REGULATOR_LDO5:

	case PCF50633_REGULATOR_LDO6:

	case PCF50633_REGULATOR_LDO6:

	case PCF50633_REGULATOR_HCLDO:

	case PCF50633_REGULATOR_HCLDO:

	case PCF50633_REGULATOR_MEMLDO:

		millivolts = ldo_voltage_value(bits);

		millivolts = ldo_voltage_value(bits);

		break;

		break;

	default:

	default:
@@ -217,9 +219,6 @@ static int pcf50633_regulator_list_voltage(struct regulator_dev *rdev, 
	case PCF50633_REGULATOR_AUTO:

	case PCF50633_REGULATOR_AUTO:

		index += 0x2f;

		index += 0x2f;

		break;

		break;

	case PCF50633_REGULATOR_HCLDO:

		index += 0x01;

		break;

	default:

	default:

		break;

		break;

	}

	}
@@ -288,27 +287,27 @@ static struct regulator_ops pcf50633_regulator_ops = { 




static struct regulator_desc regulators[] = {

static struct regulator_desc regulators[] = {

	[PCF50633_REGULATOR_AUTO] =

	[PCF50633_REGULATOR_AUTO] =

		PCF50633_REGULATOR("auto", PCF50633_REGULATOR_AUTO, 80),

		PCF50633_REGULATOR("auto", PCF50633_REGULATOR_AUTO, 81),

	[PCF50633_REGULATOR_DOWN1] =

	[PCF50633_REGULATOR_DOWN1] =

		PCF50633_REGULATOR("down1", PCF50633_REGULATOR_DOWN1, 95),

		PCF50633_REGULATOR("down1", PCF50633_REGULATOR_DOWN1, 96),

	[PCF50633_REGULATOR_DOWN2] =

	[PCF50633_REGULATOR_DOWN2] =

		PCF50633_REGULATOR("down2", PCF50633_REGULATOR_DOWN2, 95),

		PCF50633_REGULATOR("down2", PCF50633_REGULATOR_DOWN2, 96),

	[PCF50633_REGULATOR_LDO1] =

	[PCF50633_REGULATOR_LDO1] =

		PCF50633_REGULATOR("ldo1", PCF50633_REGULATOR_LDO1, 27),

		PCF50633_REGULATOR("ldo1", PCF50633_REGULATOR_LDO1, 28),

	[PCF50633_REGULATOR_LDO2] =

	[PCF50633_REGULATOR_LDO2] =

		PCF50633_REGULATOR("ldo2", PCF50633_REGULATOR_LDO2, 27),

		PCF50633_REGULATOR("ldo2", PCF50633_REGULATOR_LDO2, 28),

	[PCF50633_REGULATOR_LDO3] =

	[PCF50633_REGULATOR_LDO3] =

		PCF50633_REGULATOR("ldo3", PCF50633_REGULATOR_LDO3, 27),

		PCF50633_REGULATOR("ldo3", PCF50633_REGULATOR_LDO3, 28),

	[PCF50633_REGULATOR_LDO4] =

	[PCF50633_REGULATOR_LDO4] =

		PCF50633_REGULATOR("ldo4", PCF50633_REGULATOR_LDO4, 27),

		PCF50633_REGULATOR("ldo4", PCF50633_REGULATOR_LDO4, 28),

	[PCF50633_REGULATOR_LDO5] =

	[PCF50633_REGULATOR_LDO5] =

		PCF50633_REGULATOR("ldo5", PCF50633_REGULATOR_LDO5, 27),

		PCF50633_REGULATOR("ldo5", PCF50633_REGULATOR_LDO5, 28),

	[PCF50633_REGULATOR_LDO6] =

	[PCF50633_REGULATOR_LDO6] =

		PCF50633_REGULATOR("ldo6", PCF50633_REGULATOR_LDO6, 27),

		PCF50633_REGULATOR("ldo6", PCF50633_REGULATOR_LDO6, 28),

	[PCF50633_REGULATOR_HCLDO] =

	[PCF50633_REGULATOR_HCLDO] =

		PCF50633_REGULATOR("hcldo", PCF50633_REGULATOR_HCLDO, 26),

		PCF50633_REGULATOR("hcldo", PCF50633_REGULATOR_HCLDO, 28),

	[PCF50633_REGULATOR_MEMLDO] =

	[PCF50633_REGULATOR_MEMLDO] =

		PCF50633_REGULATOR("memldo", PCF50633_REGULATOR_MEMLDO, 0),

		PCF50633_REGULATOR("memldo", PCF50633_REGULATOR_MEMLDO, 28),

};

};





static int __devinit pcf50633_regulator_probe(struct platform_device *pdev)

static int __devinit pcf50633_regulator_probe(struct platform_device *pdev)