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>
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

diff --git a/drivers/power/supply/max8997_charger.c b/drivers/power/supply/max8997_charger.c
index a90c018..25207fe 100644 (file)
--- 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) {