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

2013-03-31 Thread Anton Vorontsov
On Thu, Mar 21, 2013 at 04:33:05PM -0400, Rhyland Klein wrote:
> 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 
> ---
>  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
> @@ -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)

  CC  drivers/power/tps65090-charger.o
drivers/power/tps65090-charger.c: In function ‘tps65090_charger_probe’:
drivers/power/tps65090-charger.c:198:19: warning: unused variable 
‘tps65090_mfd’ [-Wunused-variable]

...I fixed this up and applied the patches.

Thanks!

Anton
___
devicetree-discuss mailing list
devicetree-discuss@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/devicetree-discuss


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

2013-03-21 Thread Rhyland Klein
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 
---
 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

___
devicetree-discuss mailing list
devicetree-discuss@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/devicetree-discuss