summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2012-08-05 10:09:57 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-08-28 11:00:25 -0700
commit2c58e2669f197ab0fd5e7552fe82f7bc7d06b15d (patch)
tree6db6d1abe97eaf4d604badd2e7b127a94fe67b0e /drivers/regulator
parent7fee2afb5354f4391cbabba5f377c18d1fe50a83 (diff)
downloadlinux-stable-2c58e2669f197ab0fd5e7552fe82f7bc7d06b15d.tar.gz
linux-stable-2c58e2669f197ab0fd5e7552fe82f7bc7d06b15d.tar.bz2
linux-stable-2c58e2669f197ab0fd5e7552fe82f7bc7d06b15d.zip
regulator: max77686: initialize of_node param for regulator register
Initialize config.of_node for regulator before registering. This is needed for DT based regulator support. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/max77686.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/regulator/max77686.c b/drivers/regulator/max77686.c
index c564af6f05a3..87544b34628a 100644
--- a/drivers/regulator/max77686.c
+++ b/drivers/regulator/max77686.c
@@ -265,6 +265,7 @@ static int max77686_pmic_dt_parse_pdata(struct max77686_dev *iodev,
rmatch.of_node = NULL;
of_regulator_match(iodev->dev, regulators_np, &rmatch, 1);
rdata[i].initdata = rmatch.init_data;
+ rdata[i].of_node = rmatch.of_node;
}
pdata->regulators = rdata;
@@ -325,6 +326,7 @@ static __devinit int max77686_pmic_probe(struct platform_device *pdev)
for (i = 0; i < MAX77686_REGULATORS; i++) {
config.init_data = pdata->regulators[i].initdata;
+ config.of_node = pdata->regulators[i].of_node;
rdev[i] = regulator_register(&regulators[i], &config);
if (IS_ERR(rdev[i])) {