[PATCH 2/2] power_supply: tps65090: Setup compatible property for dt

From: Rhyland Klein
Date: Thu Mar 21 2013 - 16:33:13 EST


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@xxxxxxxxxx>
---
drivers/power/tps65090-charger.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/power/tps65090-charger.c b/drivers/power/tps65090-charger.c
index 0c66c66..3b3dafd 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);
@@ -204,7 +204,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 +300,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,
--
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/