Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull from Mark Brown:
"A simple, driver specific fix. This device isn't widely used outside
of Marvell reference boards most of which are probably used with their
BSPs rather than with mainline so low risk."
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
regulator: fix the ldo configure according to 88pm860x spec
+3
-3
+3
-3
drivers/regulator/88pm8607.c
+3
-3
drivers/regulator/88pm8607.c
···
196
196
};
197
197
198
198
static const unsigned int LDO13_table[] = {
199
-
1300000, 1800000, 2000000, 2500000, 2800000, 3000000, 0, 0,
199
+
1200000, 1300000, 1800000, 2000000, 2500000, 2800000, 3000000, 0,
200
200
};
201
201
202
202
static const unsigned int LDO13_suspend_table[] = {
···
389
389
PM8607_LDO( 7, LDO7, 0, 3, SUPPLIES_EN12, 1),
390
390
PM8607_LDO( 8, LDO8, 0, 3, SUPPLIES_EN12, 2),
391
391
PM8607_LDO( 9, LDO9, 0, 3, SUPPLIES_EN12, 3),
392
-
PM8607_LDO(10, LDO10, 0, 3, SUPPLIES_EN12, 4),
392
+
PM8607_LDO(10, LDO10, 0, 4, SUPPLIES_EN12, 4),
393
393
PM8607_LDO(12, LDO12, 0, 4, SUPPLIES_EN12, 5),
394
394
PM8607_LDO(13, VIBRATOR_SET, 1, 3, VIBRATOR_SET, 0),
395
-
PM8607_LDO(14, LDO14, 0, 4, SUPPLIES_EN12, 6),
395
+
PM8607_LDO(14, LDO14, 0, 3, SUPPLIES_EN12, 6),
396
396
};
397
397
398
398
static int __devinit pm8607_regulator_probe(struct platform_device *pdev)