power_supply: tps65090: Update bindings for subnode
PATCH 1/2 power_supply: tps65090: Update bindings for subnode
This updates the DT documentation to reflect that the tps65090-charger should be represented as a child node of the tps65090 device itself.
--- .../devicetree/bindings/power_supply/tps65090.txt | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-)
Documentation/devicetree/bindings/power_supply/tps65090.txt +6 -12
@@ -1,23 +1,17 @@ TPS65090 Frontend PMU with Switchmode Charger Required Properties: --compatible: "ti,tps65090" --reg: I2C slave address --interrupts: the interrupt output to which this device connects +-compatible: "ti,tps65090-charger" Optional Properties: -ti,enable-low-current-chrg: Enables charging when a low current is detected while the default logic is to stop charging. -Example: +This node is a subnode of the tps65090 PMIC. - tps65090@48 { - compatible = "ti,tps65090"; - reg = <0x48>; - interrupts = <0 88 0x4>; +Example: + tps65090-charger { + compatible = "ti,tps65090-charger"; ti,enable-low-current-chrg; - - regulators { - ... - }; + };
Signature · 1 line
1.7.9.5
PATCH 2/2 power_supply: 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.
--- drivers/power/tps65090-charger.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/power/tps65090-charger.c +8 -2
@@ -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,
Signature · 1 line
1.7.9.5
Re: [PATCH 2/2] power_supply: tps65090: Setup compatible property for dt
Quoted 14 lines · 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 <[email protected]>--- drivers/power/tps65090-charger.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)drivers/power/tps65090-charger.c +0
-0
drivers/power/tps65090-charger.c static int tps65090_charger_probe(struct platform_device *pdev) · line 207
Quoted 5 lines
drivers/power/tps65090-charger.c +1
-1@@ -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.odrivers/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