diff options
| author | Axel Lin <axel.lin@gmail.com> | 2012-08-05 10:09:57 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-28 11:00:25 -0700 |
| commit | 2c58e2669f197ab0fd5e7552fe82f7bc7d06b15d (patch) | |
| tree | 6db6d1abe97eaf4d604badd2e7b127a94fe67b0e | |
| parent | 7fee2afb5354f4391cbabba5f377c18d1fe50a83 (diff) | |
| download | talos-obmc-linux-2c58e2669f197ab0fd5e7552fe82f7bc7d06b15d.tar.gz talos-obmc-linux-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>
| -rw-r--r-- | drivers/regulator/max77686.c | 2 | ||||
| -rw-r--r-- | include/linux/mfd/max77686.h | 1 |
2 files changed, 3 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(®ulators[i], &config); if (IS_ERR(rdev[i])) { diff --git a/include/linux/mfd/max77686.h b/include/linux/mfd/max77686.h index 3d7ae4d7fd36..46c0f320ed76 100644 --- a/include/linux/mfd/max77686.h +++ b/include/linux/mfd/max77686.h @@ -74,6 +74,7 @@ enum max77686_regulators { struct max77686_regulator_data { int id; struct regulator_init_data *initdata; + struct device_node *of_node; }; enum max77686_opmode { |
