summaryrefslogtreecommitdiff
path: root/drivers/regulator/tps65218-regulator.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-07-09 12:28:49 +0400
committerMark Brown <broonie@linaro.org>2014-07-09 12:28:49 +0400
commite60781b4eb4849ae02f2f103acbde873a2ee55c9 (patch)
treea73d51f20b37f809880cc8fe7f2163570c01d3a3 /drivers/regulator/tps65218-regulator.c
parent5f986f7c2b878142f80cc23391631a71772692a8 (diff)
parent42ab0f3915f22728f54bb1f3c0dcf38ab2335b5b (diff)
downloadlinux-e60781b4eb4849ae02f2f103acbde873a2ee55c9.tar.xz
Merge remote-tracking branch 'regulator/fix/tps65218' into regulator-tps65218
Diffstat (limited to 'drivers/regulator/tps65218-regulator.c')
-rw-r--r--drivers/regulator/tps65218-regulator.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/regulator/tps65218-regulator.c b/drivers/regulator/tps65218-regulator.c
index 8b24404be0bd..f56bc06389e4 100644
--- a/drivers/regulator/tps65218-regulator.c
+++ b/drivers/regulator/tps65218-regulator.c
@@ -68,7 +68,7 @@ static const struct regulator_linear_range ldo1_dcdc3_ranges[] = {
static const struct regulator_linear_range dcdc4_ranges[] = {
REGULATOR_LINEAR_RANGE(1175000, 0x0, 0xf, 25000),
- REGULATOR_LINEAR_RANGE(1550000, 0x10, 0x34, 50000),
+ REGULATOR_LINEAR_RANGE(1600000, 0x10, 0x34, 50000),
};
static struct tps_info tps65218_pmic_regs[] = {
@@ -209,7 +209,7 @@ static const struct regulator_desc regulators[] = {
1, -1, -1, TPS65218_REG_ENABLE1,
TPS65218_ENABLE1_DC6_EN, NULL, NULL, 0, 0),
TPS65218_REGULATOR("LDO1", TPS65218_LDO_1, tps65218_ldo1_dcdc34_ops, 64,
- TPS65218_REG_CONTROL_DCDC4,
+ TPS65218_REG_CONTROL_LDO1,
TPS65218_CONTROL_LDO1_MASK, TPS65218_REG_ENABLE2,
TPS65218_ENABLE2_LDO1_EN, NULL, ldo1_dcdc3_ranges,
2, 0),
@@ -240,6 +240,7 @@ static int tps65218_regulator_probe(struct platform_device *pdev)
config.init_data = init_data;
config.driver_data = tps;
config.regmap = tps->regmap;
+ config.of_node = pdev->dev.of_node;
rdev = devm_regulator_register(&pdev->dev, &regulators[id], &config);
if (IS_ERR(rdev)) {