From b5c01470d46baeb698498391df520418472b3446 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Wed, 18 Jul 2012 12:31:03 +0800 Subject: [PATCH] --- yaml --- r: 321847 b: refs/heads/master c: 12565b166dab7966c2991c1561f3c22e9dad5535 h: refs/heads/master i: 321845: 06e8d180a91a067a1dcf1095e0e25d9b48d9b702 321843: b69dae77b0f5641444244bc533366844738f9c6d 321839: 0f1214992b6adb88576791c96be3cfba744dcdcb v: v3 --- [refs] | 2 +- trunk/drivers/regulator/palmas-regulator.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 20e482b77385..b39a0d9ea0dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5f8ae2154eeb7ed18c6e3dbf6ac095ea4c3d5cf +refs/heads/master: 12565b166dab7966c2991c1561f3c22e9dad5535 diff --git a/trunk/drivers/regulator/palmas-regulator.c b/trunk/drivers/regulator/palmas-regulator.c index 0fcf3550f65d..9e3e7f3c4086 100644 --- a/trunk/drivers/regulator/palmas-regulator.c +++ b/trunk/drivers/regulator/palmas-regulator.c @@ -679,7 +679,9 @@ static __devinit int palmas_probe(struct platform_device *pdev) case PALMAS_REG_SMPS10: pmic->desc[id].n_voltages = PALMAS_SMPS10_NUM_VOLTAGES; pmic->desc[id].ops = &palmas_ops_smps10; - pmic->desc[id].vsel_reg = PALMAS_SMPS10_CTRL; + pmic->desc[id].vsel_reg = + PALMAS_BASE_TO_REG(PALMAS_SMPS_BASE, + PALMAS_SMPS10_CTRL); pmic->desc[id].vsel_mask = SMPS10_VSEL; pmic->desc[id].enable_reg = PALMAS_BASE_TO_REG(PALMAS_SMPS_BASE,