diff options
| author | Todd Poynor <toddpoynor@google.com> | 2012-04-19 16:08:42 -0700 |
|---|---|---|
| committer | Todd Poynor <toddpoynor@google.com> | 2012-04-19 16:09:11 -0700 |
| commit | 84c606de0617ba304bca456f0ad06729198a5333 (patch) | |
| tree | d6f615065646e72ae0914260388db121297b3c02 /drivers/regulator | |
| parent | a6d21d824242244ec6c02c18a517bf021f1e70cd (diff) | |
| parent | 0527fde0639955203ad48a9fd83bd6fc35e82e07 (diff) | |
| download | kernel_samsung_tuna-84c606de0617ba304bca456f0ad06729198a5333.tar.gz kernel_samsung_tuna-84c606de0617ba304bca456f0ad06729198a5333.tar.bz2 kernel_samsung_tuna-84c606de0617ba304bca456f0ad06729198a5333.zip | |
Merge linux-stable 3.0.28 into linux-omap-3.0
Change-Id: I76904a60370e2cb9cc29ccde5d526d9183ff4f8e
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/88pm8607.c | 6 | ||||
| -rw-r--r-- | drivers/regulator/tps6524x-regulator.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/regulator/88pm8607.c b/drivers/regulator/88pm8607.c index d63fddb0fbb..acda58e6ef0 100644 --- a/drivers/regulator/88pm8607.c +++ b/drivers/regulator/88pm8607.c @@ -195,7 +195,7 @@ static const unsigned int LDO12_suspend_table[] = { }; static const unsigned int LDO13_table[] = { - 1300000, 1800000, 2000000, 2500000, 2800000, 3000000, 0, 0, + 1200000, 1300000, 1800000, 2000000, 2500000, 2800000, 3000000, 0, }; static const unsigned int LDO13_suspend_table[] = { @@ -388,10 +388,10 @@ static struct pm8607_regulator_info pm8607_regulator_info[] = { PM8607_LDO( 7, LDO7, 0, 3, SUPPLIES_EN12, 1), PM8607_LDO( 8, LDO8, 0, 3, SUPPLIES_EN12, 2), PM8607_LDO( 9, LDO9, 0, 3, SUPPLIES_EN12, 3), - PM8607_LDO(10, LDO10, 0, 3, SUPPLIES_EN12, 4), + PM8607_LDO(10, LDO10, 0, 4, SUPPLIES_EN12, 4), PM8607_LDO(12, LDO12, 0, 4, SUPPLIES_EN12, 5), PM8607_LDO(13, VIBRATOR_SET, 1, 3, VIBRATOR_SET, 0), - PM8607_LDO(14, LDO14, 0, 4, SUPPLIES_EN12, 6), + PM8607_LDO(14, LDO14, 0, 3, SUPPLIES_EN12, 6), }; static int __devinit pm8607_regulator_probe(struct platform_device *pdev) diff --git a/drivers/regulator/tps6524x-regulator.c b/drivers/regulator/tps6524x-regulator.c index 9166aa0a9df..229b6f4bb8b 100644 --- a/drivers/regulator/tps6524x-regulator.c +++ b/drivers/regulator/tps6524x-regulator.c @@ -481,7 +481,7 @@ static int set_voltage(struct regulator_dev *rdev, int min_uV, int max_uV, if (i >= info->n_voltages) i = info->n_voltages - 1; - *selector = info->voltages[i]; + *selector = i; return write_field(hw, &info->voltage, i); } |