summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2014-02-19 16:35:03 +0800
committerMark Brown <broonie@linaro.org>2014-02-19 21:18:58 +0900
commit948838a10ad24afea3229957b6f02f8587a569e0 (patch)
tree26ba2301e3581374859f76c29c1b20d8458ea0c2 /drivers/regulator
parent413be59e2f33382305876b17f218666d03cf3aac (diff)
downloadop-kernel-dev-948838a10ad24afea3229957b6f02f8587a569e0.zip
op-kernel-dev-948838a10ad24afea3229957b6f02f8587a569e0.tar.gz
regulator: tps65218: Add OF dependency
This is a DT-only driver, so make it depend on OF and remove of_match_ptr in the code. Signed-off-by: Axel Lin <axel.lin@ingics.com> Acked-by: Keerthy <j-keerthy@ti.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/Kconfig2
-rw-r--r--drivers/regulator/tps65218-regulator.c14
2 files changed, 7 insertions, 9 deletions
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index b05da880..b7c95e8 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -515,7 +515,7 @@ config REGULATOR_TPS65217
config REGULATOR_TPS65218
tristate "TI TPS65218 Power regulators"
- depends on MFD_TPS65218
+ depends on MFD_TPS65218 && OF
help
This driver supports TPS65218 voltage regulator chips. TPS65218
provides six step-down converters and one general-purpose LDO
diff --git a/drivers/regulator/tps65218-regulator.c b/drivers/regulator/tps65218-regulator.c
index 1fb1db5..cec72fa 100644
--- a/drivers/regulator/tps65218-regulator.c
+++ b/drivers/regulator/tps65218-regulator.c
@@ -243,14 +243,12 @@ static int tps65218_regulator_probe(struct platform_device *pdev)
int id;
match = of_match_device(tps65218_of_match, &pdev->dev);
- if (match) {
- template = match->data;
- id = template->id;
- init_data = of_get_regulator_init_data(&pdev->dev,
- pdev->dev.of_node);
- } else {
+ if (!match)
return -ENODEV;
- }
+
+ template = match->data;
+ id = template->id;
+ init_data = of_get_regulator_init_data(&pdev->dev, pdev->dev.of_node);
platform_set_drvdata(pdev, tps);
@@ -274,7 +272,7 @@ static struct platform_driver tps65218_regulator_driver = {
.driver = {
.name = "tps65218-pmic",
.owner = THIS_MODULE,
- .of_match_table = of_match_ptr(tps65218_of_match),
+ .of_match_table = tps65218_of_match,
},
.probe = tps65218_regulator_probe,
};
OpenPOWER on IntegriCloud