56 lines
2.1 KiB
Diff
56 lines
2.1 KiB
Diff
|
From 601b2f6ce656d0e29724131511e9b58da9c703d4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Timon Baetz <timon.baetz@protonmail.com>
|
||
|
|
Date: Sun, 24 Jan 2021 18:22:14 +0100
|
||
|
|
Subject: [PATCH] power: supply: max8997_charger: Switch to new binding
|
||
|
|
|
||
|
|
Get regulator from parent device's node and extcon by name.
|
||
|
|
|
||
|
|
Signed-off-by: Timon Baetz <timon.baetz@protonmail.com>
|
||
|
|
---
|
||
|
|
drivers/power/supply/max8997_charger.c | 12 ++++++++----
|
||
|
|
1 file changed, 8 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/power/supply/max8997_charger.c b/drivers/power/supply/max8997_charger.c
|
||
|
|
index 321bd6b8ee41..625d8cc4312a 100644
|
||
|
|
--- a/drivers/power/supply/max8997_charger.c
|
||
|
|
+++ b/drivers/power/supply/max8997_charger.c
|
||
|
|
@@ -168,6 +168,7 @@ static int max8997_battery_probe(struct platform_device *pdev)
|
||
|
|
int ret = 0;
|
||
|
|
struct charger_data *charger;
|
||
|
|
struct max8997_dev *iodev = dev_get_drvdata(pdev->dev.parent);
|
||
|
|
+ struct device_node *np = pdev->dev.of_node;
|
||
|
|
struct i2c_client *i2c = iodev->i2c;
|
||
|
|
struct max8997_platform_data *pdata = iodev->pdata;
|
||
|
|
struct power_supply_config psy_cfg = {};
|
||
|
|
@@ -237,20 +238,23 @@ static int max8997_battery_probe(struct platform_device *pdev)
|
||
|
|
return PTR_ERR(charger->battery);
|
||
|
|
}
|
||
|
|
|
||
|
|
+ // grab regulator from parent device's node
|
||
|
|
+ pdev->dev.of_node = iodev->dev->of_node;
|
||
|
|
charger->reg = devm_regulator_get_optional(&pdev->dev, "charger");
|
||
|
|
+ pdev->dev.of_node = np;
|
||
|
|
if (IS_ERR(charger->reg)) {
|
||
|
|
if (PTR_ERR(charger->reg) == -EPROBE_DEFER)
|
||
|
|
return -EPROBE_DEFER;
|
||
|
|
dev_info(&pdev->dev, "couldn't get charger regulator\n");
|
||
|
|
}
|
||
|
|
- charger->edev = extcon_get_edev_by_phandle(&pdev->dev, 0);
|
||
|
|
- if (IS_ERR(charger->edev)) {
|
||
|
|
- if (PTR_ERR(charger->edev) == -EPROBE_DEFER)
|
||
|
|
+ charger->edev = extcon_get_extcon_dev("max8997-muic");
|
||
|
|
+ if (IS_ERR_OR_NULL(charger->edev)) {
|
||
|
|
+ if (!charger->edev)
|
||
|
|
return -EPROBE_DEFER;
|
||
|
|
dev_info(charger->dev, "couldn't get extcon device\n");
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (!IS_ERR(charger->reg) && !IS_ERR(charger->edev)) {
|
||
|
|
+ if (!IS_ERR(charger->reg) && !IS_ERR_OR_NULL(charger->edev)) {
|
||
|
|
INIT_WORK(&charger->extcon_work, max8997_battery_extcon_evt_worker);
|
||
|
|
ret = devm_add_action(&pdev->dev, max8997_battery_extcon_evt_stop_work, charger);
|
||
|
|
if (ret) {
|
||
|
|
--
|
||
|
|
2.25.1
|
||
|
|
|