summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/core.c
diff options
context:
space:
mode:
authorRajendra Nayak <rnayak@ti.com>2011-11-18 16:47:19 +0530
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-23 18:47:04 +0000
commit2c043bcbf287dc69848054d5c02c55c20f7a7bc5 (patch)
tree72de90d5c943694ef18b74d9250235030a4b7eef /drivers/regulator/core.c
parentcef49102c1d6b1e7adcb3f8b706757e0731e955c (diff)
downloadlinux-stable-2c043bcbf287dc69848054d5c02c55c20f7a7bc5.tar.gz
linux-stable-2c043bcbf287dc69848054d5c02c55c20f7a7bc5.tar.bz2
linux-stable-2c043bcbf287dc69848054d5c02c55c20f7a7bc5.zip
regulator: pass additional of_node to regulator_register()
With device tree support for regulators, its needed that the regulator_dev->dev device has the right of_node attached. To be able to do this add an additional parameter to the regulator_register() api, wherein the dt-adapted driver can then pass this additional info onto the regulator core. Signed-off-by: Rajendra Nayak <rnayak@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator/core.c')
-rw-r--r--drivers/regulator/core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 669d02160221..8b01eb06ba64 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2637,7 +2637,7 @@ static void rdev_init_debugfs(struct regulator_dev *rdev)
*/
struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
struct device *dev, const struct regulator_init_data *init_data,
- void *driver_data)
+ void *driver_data, struct device_node *of_node)
{
static atomic_t regulator_no = ATOMIC_INIT(0);
struct regulator_dev *rdev;
@@ -2696,6 +2696,7 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
/* register with sysfs */
rdev->dev.class = &regulator_class;
+ rdev->dev.of_node = of_node;
rdev->dev.parent = dev;
dev_set_name(&rdev->dev, "regulator.%d",
atomic_inc_return(&regulator_no) - 1);