aboutsummaryrefslogtreecommitdiff
path: root/drivers/power
diff options
context:
space:
mode:
authorRhyland Klein <rklein@nvidia.com>2013-03-21 16:33:05 -0400
committerAnton Vorontsov <anton@enomsg.org>2013-03-31 23:15:47 -0700
commit594f8f888d325591851f419c22e0349263214eff (patch)
treeb876a7ccb0ceaf6d7f0edf1b51a0dd275761c770 /drivers/power
parent6b24c9cb7d57a41f2ff193bcfcc2e1976bb4bbac (diff)
downloadlinux-linaro-stable-594f8f888d325591851f419c22e0349263214eff.tar.gz
tps65090: Setup compatible property for dt
Setup the compatible property so that when this device is registered through device tree, it can match the expected compatiblity string used in the tps65090 driver. Signed-off-by: Rhyland Klein <rklein@nvidia.com> Signed-off-by: Anton Vorontsov <anton@enomsg.org>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/tps65090-charger.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/power/tps65090-charger.c b/drivers/power/tps65090-charger.c
index 0c66c6656b13..9fbca310a2ad 100644
--- a/drivers/power/tps65090-charger.c
+++ b/drivers/power/tps65090-charger.c
@@ -168,7 +168,7 @@ static struct tps65090_platform_data *
tps65090_parse_dt_charger_data(struct platform_device *pdev)
{
struct tps65090_platform_data *pdata;
- struct device_node *np = pdev->dev.parent->of_node;
+ struct device_node *np = pdev->dev.of_node;
unsigned int prop;
pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
@@ -195,7 +195,6 @@ static struct tps65090_platform_data *
static int tps65090_charger_probe(struct platform_device *pdev)
{
- struct tps65090 *tps65090_mfd = dev_get_drvdata(pdev->dev.parent);
struct tps65090_charger *cdata;
struct tps65090_platform_data *pdata;
uint8_t status1 = 0;
@@ -204,7 +203,7 @@ static int tps65090_charger_probe(struct platform_device *pdev)
pdata = dev_get_platdata(pdev->dev.parent);
- if (!pdata && tps65090_mfd->dev->of_node)
+ if (!pdata && pdev->dev.of_node)
pdata = tps65090_parse_dt_charger_data(pdev);
if (!pdata) {
@@ -300,9 +299,15 @@ static int tps65090_charger_remove(struct platform_device *pdev)
return 0;
}
+static struct of_device_id of_tps65090_charger_match[] = {
+ { .compatible = "ti,tps65090-charger", },
+ { /* end */ }
+};
+
static struct platform_driver tps65090_charger_driver = {
.driver = {
.name = "tps65090-charger",
+ .of_match_table = of_tps65090_charger_match,
.owner = THIS_MODULE,
},
.probe = tps65090_charger_probe,