From e7c27850a8b3f0af97f434b04e8e68fe00c5aac4 Mon Sep 17 00:00:00 2001 From: Rhyland Klein Date: Thu, 21 Mar 2013 16:33:05 -0400 Subject: [PATCH] --- yaml --- r: 367509 b: refs/heads/master c: 594f8f888d325591851f419c22e0349263214eff h: refs/heads/master i: 367507: 3dd11f2d2c1888b32e1d856aed282f2ebe0e4f27 v: v3 --- [refs] | 2 +- trunk/drivers/power/tps65090-charger.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4ca02968393c..4b1ce10aa8df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b24c9cb7d57a41f2ff193bcfcc2e1976bb4bbac +refs/heads/master: 594f8f888d325591851f419c22e0349263214eff diff --git a/trunk/drivers/power/tps65090-charger.c b/trunk/drivers/power/tps65090-charger.c index 0c66c6656b13..9fbca310a2ad 100644 --- a/trunk/drivers/power/tps65090-charger.c +++ b/trunk/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,