diff options
| author | Andrew F. Davis <afd@ti.com> | 2015-12-01 12:44:03 -0600 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-12-01 19:58:58 +0000 |
| commit | 7f9354f26e3f84d349615e17888111ae204557a0 (patch) | |
| tree | 6172e0304ce4a59b37be927155bad433fe733b27 /drivers/regulator/tps65086-regulator.c | |
| parent | d2a2e729a666972d1938e63e804ee5bb6ea13549 (diff) | |
| download | talos-obmc-linux-7f9354f26e3f84d349615e17888111ae204557a0.tar.gz talos-obmc-linux-7f9354f26e3f84d349615e17888111ae204557a0.zip | |
regulator: tps65086: Update regulator driver for the TPS65086 PMIC
Make changes to allow this driver to work with the updated TPS65086 core
driver and bindings.
Signed-off-by: Andrew F. Davis <afd@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator/tps65086-regulator.c')
| -rw-r--r-- | drivers/regulator/tps65086-regulator.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/regulator/tps65086-regulator.c b/drivers/regulator/tps65086-regulator.c index c26fc7e88eba..33f389d583ef 100644 --- a/drivers/regulator/tps65086-regulator.c +++ b/drivers/regulator/tps65086-regulator.c @@ -16,10 +16,9 @@ */ #include <linux/module.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/regulator/driver.h> -#include <linux/regulator/of_regulator.h> #include <linux/mfd/tps65086.h> @@ -31,6 +30,7 @@ enum tps65086_regulators { BUCK1, BUCK2, BUCK3, BUCK4, BUCK5, BUCK6, LDOA1, .desc = { \ .name = _name, \ .of_match = of_match_ptr(_of), \ + .regulators_node = "regulators", \ .of_parse_cb = tps65086_of_parse_cb, \ .id = _id, \ .ops = ®_ops, \ @@ -54,6 +54,7 @@ enum tps65086_regulators { BUCK1, BUCK2, BUCK3, BUCK4, BUCK5, BUCK6, LDOA1, .desc = { \ .name = _name, \ .of_match = of_match_ptr(_of), \ + .regulators_node = "regulators", \ .of_parse_cb = tps65086_of_parse_cb, \ .id = _id, \ .ops = &switch_ops, \ @@ -213,8 +214,8 @@ static int tps65086_regulator_probe(struct platform_device *pdev) platform_set_drvdata(pdev, tps); config.dev = &pdev->dev; + config.dev->of_node = tps->dev->of_node; config.driver_data = tps; - config.of_node = pdev->dev.of_node; config.regmap = tps->regmap; for (i = 0; i < ARRAY_SIZE(regulators); i++) { |
