diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-30 17:11:18 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-30 17:11:18 (GMT) |
| commit | f004eaf4d17d205842424a7e95dcff9a46fe3c5f (patch) | |
| tree | fbf213d7b933b4f58b031269a2a31b275c95be6c /drivers/regulator | |
| parent | abf92a3d2e868fef808d4a205371b7e5417dd0f7 (diff) | |
| parent | 937433c2502f663e5a0e8804462bc38c41b9021f (diff) | |
| download | linux-f004eaf4d17d205842424a7e95dcff9a46fe3c5f.tar.xz | |
Merge remote-tracking branch 'regulator/topic/da9210' into regulator-devm
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/da9210-regulator.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/regulator/da9210-regulator.c b/drivers/regulator/da9210-regulator.c index f0fe54b..f7ccff1 100644 --- a/drivers/regulator/da9210-regulator.c +++ b/drivers/regulator/da9210-regulator.c @@ -25,6 +25,7 @@ #include <linux/slab.h> #include <linux/regulator/driver.h> #include <linux/regulator/machine.h> +#include <linux/regulator/of_regulator.h> #include <linux/regmap.h> #include "da9210-regulator.h" @@ -126,7 +127,8 @@ static int da9210_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { struct da9210 *chip; - struct da9210_pdata *pdata = i2c->dev.platform_data; + struct device *dev = &i2c->dev; + struct da9210_pdata *pdata = dev_get_platdata(dev); struct regulator_dev *rdev = NULL; struct regulator_config config = { }; int error; @@ -147,10 +149,11 @@ static int da9210_i2c_probe(struct i2c_client *i2c, } config.dev = &i2c->dev; - if (pdata) - config.init_data = &pdata->da9210_constraints; + config.init_data = pdata ? &pdata->da9210_constraints : + of_get_regulator_init_data(dev, dev->of_node); config.driver_data = chip; config.regmap = chip->regmap; + config.of_node = dev->of_node; rdev = regulator_register(&da9210_reg, &config); if (IS_ERR(rdev)) { |