Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 908d6d52928a7f2a4b317aac47542c5fbef43d88

Authored by Aaro Koskinen
Committed by Mark Brown
1 parent b2a1ef473b

regulator: twl-regulator: fix up VINTANA1/VINTANA2 

It seems commit 2098e95ce9bb039ff2e7bf836df358d18a176139 (regulator: twl:
adapt twl-regulator driver to dt) accidentally deleted VINTANA1. Also
the same commit defines VINTANA2 twice with TWL4030_ADJUSTABLE_LDO and
TWL4030_FIXED_LDO. This patch changes the fixed one to be VINTANA1.

I noticed this when auditing my N900 boot logs. I could not notice any
change in device behaviour, though, except that the boot logs are now
like before:

	...
	[    0.282928] VDAC: 1800 mV normal standby
	[    0.284027] VCSI: 1800 mV normal standby
	[    0.285400] VINTANA1: 1500 mV normal standby
	[    0.286865] VINTANA2: 2750 mV normal standby
	[    0.288208] VINTDIG: 1500 mV normal standby
	[    0.289978] VSDI_CSI: 1800 mV normal standby
	...

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@vger.kernel.org

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

drivers/regulator/twl-regulator.c
Diff comments   View file @ 908d6d5
... ... @@ -1037,7 +1037,7 @@
1037 1037 TWL6025_ADJUSTABLE_LDO(LDO6, 0x60, 1000, 3300);
1038 1038 TWL6025_ADJUSTABLE_LDO(LDOLN, 0x64, 1000, 3300);
1039 1039 TWL6025_ADJUSTABLE_LDO(LDOUSB, 0x70, 1000, 3300);
1040   -TWL4030_FIXED_LDO(VINTANA2, 0x3f, 1500, 11, 100, 0x08);
  1040 +TWL4030_FIXED_LDO(VINTANA1, 0x3f, 1500, 11, 100, 0x08);
1041 1041 TWL4030_FIXED_LDO(VINTDIG, 0x47, 1500, 13, 100, 0x08);
1042 1042 TWL4030_FIXED_LDO(VUSB1V5, 0x71, 1500, 17, 100, 0x08);
1043 1043 TWL4030_FIXED_LDO(VUSB1V8, 0x74, 1800, 18, 100, 0x08);
... ... @@ -1116,7 +1116,7 @@
1116 1116 TWL6025_OF_MATCH("ti,twl6025-ldo6", LDO6),
1117 1117 TWL6025_OF_MATCH("ti,twl6025-ldoln", LDOLN),
1118 1118 TWL6025_OF_MATCH("ti,twl6025-ldousb", LDOUSB),
1119   - TWLFIXED_OF_MATCH("ti,twl4030-vintana2", VINTANA2),
  1119 + TWLFIXED_OF_MATCH("ti,twl4030-vintana1", VINTANA1),
1120 1120 TWLFIXED_OF_MATCH("ti,twl4030-vintdig", VINTDIG),
1121 1121 TWLFIXED_OF_MATCH("ti,twl4030-vusb1v5", VUSB1V5),
1122 1122 TWLFIXED_OF_MATCH("ti,twl4030-vusb1v8", VUSB1V8),