Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Timon Baetz and committed by
Sebastian Reichel
416682f2 9f45275a

+8 -4
+8 -4
drivers/power/supply/max8997_charger.c
··· 168 168 int ret = 0; 169 169 struct charger_data *charger; 170 170 struct max8997_dev *iodev = dev_get_drvdata(pdev->dev.parent); 171 + struct device_node *np = pdev->dev.of_node; 171 172 struct i2c_client *i2c = iodev->i2c; 172 173 struct max8997_platform_data *pdata = iodev->pdata; 173 174 struct power_supply_config psy_cfg = {}; ··· 238 237 return PTR_ERR(charger->battery); 239 238 } 240 239 240 + // grab regulator from parent device's node 241 + pdev->dev.of_node = iodev->dev->of_node; 241 242 charger->reg = devm_regulator_get_optional(&pdev->dev, "charger"); 243 + pdev->dev.of_node = np; 242 244 if (IS_ERR(charger->reg)) { 243 245 if (PTR_ERR(charger->reg) == -EPROBE_DEFER) 244 246 return -EPROBE_DEFER; 245 247 dev_info(&pdev->dev, "couldn't get charger regulator\n"); 246 248 } 247 - charger->edev = extcon_get_edev_by_phandle(&pdev->dev, 0); 248 - if (IS_ERR(charger->edev)) { 249 - if (PTR_ERR(charger->edev) == -EPROBE_DEFER) 249 + charger->edev = extcon_get_extcon_dev("max8997-muic"); 250 + if (IS_ERR_OR_NULL(charger->edev)) { 251 + if (!charger->edev) 250 252 return -EPROBE_DEFER; 251 253 dev_info(charger->dev, "couldn't get extcon device\n"); 252 254 } 253 255 254 - if (!IS_ERR(charger->reg) && !IS_ERR(charger->edev)) { 256 + if (!IS_ERR(charger->reg) && !IS_ERR_OR_NULL(charger->edev)) { 255 257 INIT_WORK(&charger->extcon_work, max8997_battery_extcon_evt_worker); 256 258 ret = devm_add_action(&pdev->dev, max8997_battery_extcon_evt_stop_work, charger); 257 259 if (ret) {