---

yaml --- r: 367509 b: refs/heads/master c: 594f8f8 h: refs/heads/master i: 367507: 3dd11f2 v: v3
git-mirror · Apr 1, 2013 · e7c2785 · e7c2785
1 parent 4b71164
commit e7c2785
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git 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
@@ -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,