From nobody Tue Feb 10 02:42:45 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D99AD20B7F7; Mon, 24 Feb 2025 23:22:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740439320; cv=none; b=mEnNSexxdcgt7T94HkMpo7ClZlBtTYpF26Hqhb3/RPAEYh7rgKrhkb9FhmypGPPP3YzVObO4S4CGuxKfs4/DP+e5JKbdkW6A32EOBn5jzPmMkbOUIKW4cTTgi+Uf8/31NKClbqg+sibRuW/aA7JyOgEqppzcBL3dJ40mugM3BlQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740439320; c=relaxed/simple; bh=ICE/RE1EYvr7EWGuxu2cszpRt22xk9kdxveP+xWDpfs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CqTbi4QmENbPDTzBih9SwwjW4ZWiOOaVdKINkq4zg3hLhsMtvzhXduw9BxS8udU5ojm46FN1xYsY6BeoOo+hyGkbMZdym6XbVZuOsZ2UWDVGFHmPNIXnfD8Ai2Rs6z3xNRIxag7q/v9ERzWfSADDBzIdfStMr5UiXE2cfIvavZU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 56998C4CEE9; Mon, 24 Feb 2025 23:22:00 +0000 (UTC) Received: by venus (Postfix, from userid 1000) id 4AD7D18067C; Tue, 25 Feb 2025 00:21:58 +0100 (CET) From: Sebastian Reichel Date: Tue, 25 Feb 2025 00:21:37 +0100 Subject: [PATCH 4/7] power: supply: all: switch psy_cfg from of_node to fwnode Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250225-psy-core-convert-to-fwnode-v1-4-d5e4369936bb@collabora.com> References: <20250225-psy-core-convert-to-fwnode-v1-0-d5e4369936bb@collabora.com> In-Reply-To: <20250225-psy-core-convert-to-fwnode-v1-0-d5e4369936bb@collabora.com> To: Sebastian Reichel , Mark Brown , Greg Kroah-Hartman , Linus Walleij , Hans de Goede Cc: Liam Girdwood , Chen-Yu Tsai , Matti Vaittinen , =?utf-8?q?Pali_Roh=C3=A1r?= , Paul Cercueil , Samuel Holland , David Lechner , Krzysztof Kozlowski , Marek Szyprowski , Sebastian Krzyszkowiak , Purism Kernel Team , Bartosz Golaszewski , Konrad Dybcio , Matthias Brugger , AngeloGioacchino Del Regno , Orson Zhai , Baolin Wang , Chunyan Zhang , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Sebastian Reichel X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=36098; i=sebastian.reichel@collabora.com; h=from:subject:message-id; bh=ICE/RE1EYvr7EWGuxu2cszpRt22xk9kdxveP+xWDpfs=; b=owEBbQKS/ZANAwAKAdju1/PIO/qaAcsmYgBnvP8ULXe20Kfzd01TH/76NfoCx6McO/4dD/P6W qPZqX3ssNCJAjMEAAEKAB0WIQTvZg0HRj+Lcmp5VBPY7tfzyDv6mgUCZ7z/FAAKCRDY7tfzyDv6 ml/5D/9v+yb9qBfUCuKEDP6wSEFqRnkQiFoY0kKqy2q1yY1YWMJqs016XnS0ctGS3vO+Qb1bVx/ R2cPqX2udDGaDsgsoAfKa123TKmPIK+O1xyBJO+m2l2SObSzB/TVXdI0HLUOQ1lA9MOmAc+SpQW IMbaaW2cFILCbLdIIZqLShbGF7e94DrkQ4sB88GGVFst6IxCIEHCShMot5B4N697tGVF2J5lDjH TYk9v2Kf52Nc5SIvLYp0/uJ/wRz8erd/aBqwJl9k+1IqhKfUy/UBMmfPAaS7VIR8gKaArZsPtx1 YdcvSDYUCOKpKwr5InWWqj498sVGv1P5/3vfrJ6DIxwhHBsGmpvaHGW8G93Tb0mVoGfz+5vQ1lk um9XmDtQGiaC6zGCMgH34gkYqnEKPRYpFMfLsMtPJDxEph1rCCDwUDu51uBwilz7wBpbdl756Lo vGp+Y2Xe/Xj4cYlG6FGg9XGRvrNsVLrgUjhOzHulmTMP8UZbrVMh2UlTIBePn/7nf7XvOoW1ZD6 XPaHisp5FdgQ7etrSpIcVoA3lvM9ti4Hd1CylECv0IzEA3XRXzYurZzZq5MuK37CPHeqx7d1/2E JB6zgFBPJuke2P01XhZyoIiDffdKW8MNIJvdmoX7uCZPJ4i3yqjj4sIJdT2ObDPPHAyAQ9z3A6h oOUhqiiEETZ7OwA== X-Developer-Key: i=sebastian.reichel@collabora.com; a=openpgp; fpr=EF660D07463F8B726A795413D8EED7F3C83BFA9A When registering a power-supply device, either a of_node or the more recent fwnode can be supplied. Since fwnode can also contain an of_node, let's try to get rid of it. Signed-off-by: Sebastian Reichel Acked-by: Baolin Wang Acked-by: Chen-Yu Tsai Reviewed-by: AngeloGioacchino Del Regno =20 --- drivers/power/supply/ab8500_charger.c | 4 ++-- drivers/power/supply/acer_a500_battery.c | 3 ++- drivers/power/supply/act8945a_charger.c | 2 +- drivers/power/supply/axp20x_ac_power.c | 2 +- drivers/power/supply/axp20x_battery.c | 2 +- drivers/power/supply/axp20x_usb_power.c | 2 +- drivers/power/supply/bd99954-charger.c | 2 +- drivers/power/supply/bq2415x_charger.c | 2 +- drivers/power/supply/bq24190_charger.c | 2 +- drivers/power/supply/bq24735-charger.c | 2 +- drivers/power/supply/bq2515x_charger.c | 2 +- drivers/power/supply/bq256xx_charger.c | 2 +- drivers/power/supply/bq25980_charger.c | 2 +- drivers/power/supply/bq27xxx_battery.c | 2 +- drivers/power/supply/cpcap-battery.c | 2 +- drivers/power/supply/cpcap-charger.c | 2 +- drivers/power/supply/ds2760_battery.c | 3 +-- drivers/power/supply/generic-adc-battery.c | 2 +- drivers/power/supply/gpio-charger.c | 2 +- drivers/power/supply/ingenic-battery.c | 2 +- drivers/power/supply/ip5xxx_power.c | 2 +- drivers/power/supply/lego_ev3_battery.c | 3 ++- drivers/power/supply/lt3651-charger.c | 2 +- drivers/power/supply/ltc4162-l-charger.c | 2 +- drivers/power/supply/max17042_battery.c | 2 +- drivers/power/supply/max77650-charger.c | 2 +- drivers/power/supply/max8903_charger.c | 2 +- drivers/power/supply/mm8013.c | 2 +- drivers/power/supply/mt6360_charger.c | 2 +- drivers/power/supply/mt6370-charger.c | 2 +- drivers/power/supply/olpc_battery.c | 4 ++-- drivers/power/supply/pm8916_bms_vm.c | 2 +- drivers/power/supply/pm8916_lbc.c | 2 +- drivers/power/supply/qcom_battmgr.c | 5 +++-- drivers/power/supply/qcom_pmi8998_charger.c | 2 +- drivers/power/supply/qcom_smbb.c | 2 +- drivers/power/supply/rk817_charger.c | 2 +- drivers/power/supply/rt5033_battery.c | 2 +- drivers/power/supply/rt5033_charger.c | 3 ++- drivers/power/supply/rt9455_charger.c | 2 +- drivers/power/supply/rt9467-charger.c | 2 +- drivers/power/supply/rt9471.c | 2 +- drivers/power/supply/sbs-battery.c | 2 +- drivers/power/supply/sbs-charger.c | 2 +- drivers/power/supply/sbs-manager.c | 2 +- drivers/power/supply/sc2731_charger.c | 2 +- drivers/power/supply/sc27xx_fuel_gauge.c | 3 +-- drivers/power/supply/smb347-charger.c | 2 +- drivers/power/supply/tps65090-charger.c | 2 +- drivers/power/supply/tps65217_charger.c | 2 +- drivers/power/supply/ucs1002_power.c | 2 +- 51 files changed, 58 insertions(+), 56 deletions(-) diff --git a/drivers/power/supply/ab8500_charger.c b/drivers/power/supply/a= b8500_charger.c index 1042d37424f5b0351edd02b5c76e58dd447d1783..5f4537766e5b907d66b44964c32= 0bc31acc7408b 100644 --- a/drivers/power/supply/ab8500_charger.c +++ b/drivers/power/supply/ab8500_charger.c @@ -3494,11 +3494,11 @@ static int ab8500_charger_probe(struct platform_dev= ice *pdev) di->invalid_charger_detect_state =3D 0; =20 /* AC and USB supply config */ - ac_psy_cfg.of_node =3D np; + ac_psy_cfg.fwnode =3D dev_fwnode(dev); ac_psy_cfg.supplied_to =3D supply_interface; ac_psy_cfg.num_supplicants =3D ARRAY_SIZE(supply_interface); ac_psy_cfg.drv_data =3D &di->ac_chg; - usb_psy_cfg.of_node =3D np; + usb_psy_cfg.fwnode =3D dev_fwnode(dev); usb_psy_cfg.supplied_to =3D supply_interface; usb_psy_cfg.num_supplicants =3D ARRAY_SIZE(supply_interface); usb_psy_cfg.drv_data =3D &di->usb_chg; diff --git a/drivers/power/supply/acer_a500_battery.c b/drivers/power/suppl= y/acer_a500_battery.c index 39d85b11a13c2350876da22ee5c427479d161351..daf01dc8025bb3d95a42b3bace2= ffa8bca029263 100644 --- a/drivers/power/supply/acer_a500_battery.c +++ b/drivers/power/supply/acer_a500_battery.c @@ -17,6 +17,7 @@ #include #include #include +#include =20 enum { REG_CAPACITY, @@ -231,7 +232,7 @@ static int a500_battery_probe(struct platform_device *p= dev) =20 platform_set_drvdata(pdev, bat); =20 - psy_cfg.of_node =3D pdev->dev.parent->of_node; + psy_cfg.fwnode =3D dev_fwnode(pdev->dev.parent); psy_cfg.drv_data =3D bat; psy_cfg.no_wakeup_source =3D true; =20 diff --git a/drivers/power/supply/act8945a_charger.c b/drivers/power/supply= /act8945a_charger.c index b2b82f97a471204e458bcdf85f68280638451a08..3901a02f326a55f820e85346ebe= 0420ac9a6f113 100644 --- a/drivers/power/supply/act8945a_charger.c +++ b/drivers/power/supply/act8945a_charger.c @@ -614,7 +614,7 @@ static int act8945a_charger_probe(struct platform_devic= e *pdev) if (ret) return -EINVAL; =20 - psy_cfg.of_node =3D pdev->dev.of_node; + psy_cfg.fwnode =3D dev_fwnode(&pdev->dev); psy_cfg.drv_data =3D charger; =20 charger->psy =3D devm_power_supply_register(&pdev->dev, diff --git a/drivers/power/supply/axp20x_ac_power.c b/drivers/power/supply/= axp20x_ac_power.c index e5733cb9e19e057f6c6d015b572530ca3d9c7e55..5f6ea416fa30a0328e6e1145cce= 3330b2fa63071 100644 --- a/drivers/power/supply/axp20x_ac_power.c +++ b/drivers/power/supply/axp20x_ac_power.c @@ -364,7 +364,7 @@ static int axp20x_ac_power_probe(struct platform_device= *pdev) =20 platform_set_drvdata(pdev, power); =20 - psy_cfg.of_node =3D pdev->dev.of_node; + psy_cfg.fwnode =3D dev_fwnode(&pdev->dev); psy_cfg.drv_data =3D power; =20 power->supply =3D devm_power_supply_register(&pdev->dev, diff --git a/drivers/power/supply/axp20x_battery.c b/drivers/power/supply/a= xp20x_battery.c index fa27195f074e7d553a7d0bb095a62d6628ef5f8e..a8d6178963d04d0266a1b4aeb8b= 00e6d4bae1cb2 100644 --- a/drivers/power/supply/axp20x_battery.c +++ b/drivers/power/supply/axp20x_battery.c @@ -1091,7 +1091,7 @@ static int axp20x_power_probe(struct platform_device = *pdev) platform_set_drvdata(pdev, axp20x_batt); =20 psy_cfg.drv_data =3D axp20x_batt; - psy_cfg.of_node =3D pdev->dev.of_node; + psy_cfg.fwnode =3D dev_fwnode(&pdev->dev); =20 axp20x_batt->data =3D (struct axp_data *)of_device_get_match_data(dev); =20 diff --git a/drivers/power/supply/axp20x_usb_power.c b/drivers/power/supply= /axp20x_usb_power.c index 9722912268fe8e33fa102f8998a96d7d4b041d2a..e6c5726108dc32b16fd3920e62a= 390ada1c5d0ad 100644 --- a/drivers/power/supply/axp20x_usb_power.c +++ b/drivers/power/supply/axp20x_usb_power.c @@ -1011,7 +1011,7 @@ static int axp20x_usb_power_probe(struct platform_dev= ice *pdev) return ret; } =20 - psy_cfg.of_node =3D pdev->dev.of_node; + psy_cfg.fwnode =3D dev_fwnode(&pdev->dev); psy_cfg.drv_data =3D power; =20 power->supply =3D devm_power_supply_register(&pdev->dev, diff --git a/drivers/power/supply/bd99954-charger.c b/drivers/power/supply/= bd99954-charger.c index 54bf882625101664fa15abd611aba0e82c073298..22453322456f744484be04b56de= 54ffe99f56096 100644 --- a/drivers/power/supply/bd99954-charger.c +++ b/drivers/power/supply/bd99954-charger.c @@ -982,7 +982,7 @@ static int bd9995x_probe(struct i2c_client *client) bd->client =3D client; bd->dev =3D dev; psy_cfg.drv_data =3D bd; - psy_cfg.of_node =3D dev->of_node; + psy_cfg.fwnode =3D dev_fwnode(dev); =20 mutex_init(&bd->lock); =20 diff --git a/drivers/power/supply/bq2415x_charger.c b/drivers/power/supply/= bq2415x_charger.c index 22f6a3b71632b637e3c8023e6d187fc136cdff20..9e3b9181ee76a4f473228bba022= 917677acce256 100644 --- a/drivers/power/supply/bq2415x_charger.c +++ b/drivers/power/supply/bq2415x_charger.c @@ -1497,7 +1497,7 @@ static int bq2415x_power_supply_init(struct bq2415x_d= evice *bq) char revstr[8]; struct power_supply_config psy_cfg =3D { .drv_data =3D bq, - .of_node =3D bq->dev->of_node, + .fwnode =3D dev_fwnode(bq->dev), .attr_grp =3D bq2415x_sysfs_groups, }; =20 diff --git a/drivers/power/supply/bq24190_charger.c b/drivers/power/supply/= bq24190_charger.c index b4ba01744368c2a338105a2735a481fe36dca169..f0d97ab45bd87f3baab20bb316e= aebef77d99ae8 100644 --- a/drivers/power/supply/bq24190_charger.c +++ b/drivers/power/supply/bq24190_charger.c @@ -2117,7 +2117,7 @@ static int bq24190_probe(struct i2c_client *client) #endif =20 charger_cfg.drv_data =3D bdi; - charger_cfg.of_node =3D dev->of_node; + charger_cfg.fwnode =3D dev_fwnode(dev); charger_cfg.supplied_to =3D bq24190_charger_supplied_to; charger_cfg.num_supplicants =3D ARRAY_SIZE(bq24190_charger_supplied_to); bdi->charger =3D power_supply_register(dev, &bq24190_charger_desc, diff --git a/drivers/power/supply/bq24735-charger.c b/drivers/power/supply/= bq24735-charger.c index 73a7fc867b0344cd0305d3d4b29c0e85c361554f..637e0da65f8739f623420a25d07= 9bfb152109bc7 100644 --- a/drivers/power/supply/bq24735-charger.c +++ b/drivers/power/supply/bq24735-charger.c @@ -402,7 +402,7 @@ static int bq24735_charger_probe(struct i2c_client *cli= ent) =20 psy_cfg.supplied_to =3D charger->pdata->supplied_to; psy_cfg.num_supplicants =3D charger->pdata->num_supplicants; - psy_cfg.of_node =3D client->dev.of_node; + psy_cfg.fwnode =3D dev_fwnode(&client->dev); psy_cfg.drv_data =3D charger; =20 i2c_set_clientdata(client, charger); diff --git a/drivers/power/supply/bq2515x_charger.c b/drivers/power/supply/= bq2515x_charger.c index a3424f67f2b1d7b607903806291896eb68aba707..a238de10750ddfe71494f5eaad3= eceffb8012671 100644 --- a/drivers/power/supply/bq2515x_charger.c +++ b/drivers/power/supply/bq2515x_charger.c @@ -1102,7 +1102,7 @@ static int bq2515x_probe(struct i2c_client *client) i2c_set_clientdata(client, bq2515x); =20 charger_cfg.drv_data =3D bq2515x; - charger_cfg.of_node =3D dev->of_node; + charger_cfg.fwnode =3D dev_fwnode(dev); =20 ret =3D bq2515x_read_properties(bq2515x); if (ret) { diff --git a/drivers/power/supply/bq256xx_charger.c b/drivers/power/supply/= bq256xx_charger.c index 5514d1896bb847da6937e7c60fb540a51b46edd6..9f9b6019f8e13f986c39fbf170c= 622af0ac9fd37 100644 --- a/drivers/power/supply/bq256xx_charger.c +++ b/drivers/power/supply/bq256xx_charger.c @@ -1657,7 +1657,7 @@ static int bq256xx_parse_dt(struct bq256xx_device *bq, int ret =3D 0; =20 psy_cfg->drv_data =3D bq; - psy_cfg->of_node =3D dev->of_node; + psy_cfg->fwnode =3D dev_fwnode(dev); =20 ret =3D device_property_read_u32(bq->dev, "ti,watchdog-timeout-ms", &bq->watchdog_timer); diff --git a/drivers/power/supply/bq25980_charger.c b/drivers/power/supply/= bq25980_charger.c index 0c5e2938bb36d6b758ebd2759b41e285716349d8..af5f0d2ad54043d35da54e2b070= f03ae7c61ff7a 100644 --- a/drivers/power/supply/bq25980_charger.c +++ b/drivers/power/supply/bq25980_charger.c @@ -1057,7 +1057,7 @@ static int bq25980_power_supply_init(struct bq25980_d= evice *bq, struct device *dev) { struct power_supply_config psy_cfg =3D { .drv_data =3D bq, - .of_node =3D dev->of_node, }; + .fwnode =3D dev_fwnode(dev), }; =20 psy_cfg.supplied_to =3D bq25980_charger_supplied_to; psy_cfg.num_supplicants =3D ARRAY_SIZE(bq25980_charger_supplied_to); diff --git a/drivers/power/supply/bq27xxx_battery.c b/drivers/power/supply/= bq27xxx_battery.c index 90a5bccfc6b9bc37403eadd31e5ad98bd16204de..9bf66da1e49e775726c6127628d= 23274b95c3f21 100644 --- a/drivers/power/supply/bq27xxx_battery.c +++ b/drivers/power/supply/bq27xxx_battery.c @@ -2199,7 +2199,7 @@ int bq27xxx_battery_setup(struct bq27xxx_device_info = *di) { struct power_supply_desc *psy_desc; struct power_supply_config psy_cfg =3D { - .of_node =3D di->dev->of_node, + .fwnode =3D dev_fwnode(di->dev), .drv_data =3D di, .no_wakeup_source =3D true, }; diff --git a/drivers/power/supply/cpcap-battery.c b/drivers/power/supply/cp= cap-battery.c index 813037c00ded567e6acdff4f202b7c8d6de80dfd..8106d1edcbc26a738874d16e6bf= 3ce0547a38143 100644 --- a/drivers/power/supply/cpcap-battery.c +++ b/drivers/power/supply/cpcap-battery.c @@ -1130,7 +1130,7 @@ static int cpcap_battery_probe(struct platform_device= *pdev) if (error) return error; =20 - psy_cfg.of_node =3D pdev->dev.of_node; + psy_cfg.fwnode =3D dev_fwnode(&pdev->dev); psy_cfg.drv_data =3D ddata; =20 ddata->psy =3D devm_power_supply_register(ddata->dev, diff --git a/drivers/power/supply/cpcap-charger.c b/drivers/power/supply/cp= cap-charger.c index 6625d539d9ae76e63cf6539f7fade727956c39b5..13300dc60baf9b8ba143c784fc2= a1d1badf64fc6 100644 --- a/drivers/power/supply/cpcap-charger.c +++ b/drivers/power/supply/cpcap-charger.c @@ -902,7 +902,7 @@ static int cpcap_charger_probe(struct platform_device *= pdev) =20 atomic_set(&ddata->active, 1); =20 - psy_cfg.of_node =3D pdev->dev.of_node; + psy_cfg.fwnode =3D dev_fwnode(&pdev->dev); psy_cfg.drv_data =3D ddata; psy_cfg.supplied_to =3D cpcap_charger_supplied_to; psy_cfg.num_supplicants =3D ARRAY_SIZE(cpcap_charger_supplied_to); diff --git a/drivers/power/supply/ds2760_battery.c b/drivers/power/supply/d= s2760_battery.c index 83bdec5a2bda901460e0a8618949baa7ecc11e46..bf933f8d052c566de6a57330e6a= df8bd97caea2f 100644 --- a/drivers/power/supply/ds2760_battery.c +++ b/drivers/power/supply/ds2760_battery.c @@ -697,12 +697,11 @@ static int w1_ds2760_add_slave(struct w1_slave *sl) ds2760_battery_external_power_changed; =20 psy_cfg.drv_data =3D di; + psy_cfg.fwnode =3D dev_fwnode(dev); =20 if (dev->of_node) { u32 tmp; =20 - psy_cfg.of_node =3D dev->of_node; - if (!of_property_read_bool(dev->of_node, "maxim,pmod-enabled")) pmod_enabled =3D true; =20 diff --git a/drivers/power/supply/generic-adc-battery.c b/drivers/power/sup= ply/generic-adc-battery.c index d5d215f5ad8b1684ea6272a82d614338a7bf19a9..f5f2566b3a32d59e3f873b6efc7= 81f4701819545 100644 --- a/drivers/power/supply/generic-adc-battery.c +++ b/drivers/power/supply/generic-adc-battery.c @@ -166,7 +166,7 @@ static int gab_probe(struct platform_device *pdev) if (!adc_bat) return -ENOMEM; =20 - psy_cfg.of_node =3D pdev->dev.of_node; + psy_cfg.fwnode =3D dev_fwnode(&pdev->dev); psy_cfg.drv_data =3D adc_bat; psy_desc =3D &adc_bat->psy_desc; psy_desc->name =3D dev_name(&pdev->dev); diff --git a/drivers/power/supply/gpio-charger.c b/drivers/power/supply/gpi= o-charger.c index 46d18ce6a7392b95e44cbf459566661e7f7cb0f3..1dfd5b0cb30d8e30897ed19013b= 79cb9dfddaeeb 100644 --- a/drivers/power/supply/gpio-charger.c +++ b/drivers/power/supply/gpio-charger.c @@ -333,7 +333,7 @@ static int gpio_charger_probe(struct platform_device *p= dev) charger_desc->property_is_writeable =3D gpio_charger_property_is_writeable; =20 - psy_cfg.of_node =3D dev->of_node; + psy_cfg.fwnode =3D dev_fwnode(dev); psy_cfg.drv_data =3D gpio_charger; =20 if (pdata) { diff --git a/drivers/power/supply/ingenic-battery.c b/drivers/power/supply/= ingenic-battery.c index 0a40f425c27723ccec49985b8b5e14a737b6a7eb..b111c7ce2be30b8110c3d34f4b8= b2faf9ab99969 100644 --- a/drivers/power/supply/ingenic-battery.c +++ b/drivers/power/supply/ingenic-battery.c @@ -146,7 +146,7 @@ static int ingenic_battery_probe(struct platform_device= *pdev) desc->num_properties =3D ARRAY_SIZE(ingenic_battery_properties); desc->get_property =3D ingenic_battery_get_property; psy_cfg.drv_data =3D bat; - psy_cfg.of_node =3D dev->of_node; + psy_cfg.fwnode =3D dev_fwnode(dev); =20 bat->battery =3D devm_power_supply_register(dev, desc, &psy_cfg); if (IS_ERR(bat->battery)) diff --git a/drivers/power/supply/ip5xxx_power.c b/drivers/power/supply/ip5= xxx_power.c index c448e0ac0dfac2fff6e43d3bcb427189391bc36e..a031eadb49ddce66f45c30edc2c= b546985ca503e 100644 --- a/drivers/power/supply/ip5xxx_power.c +++ b/drivers/power/supply/ip5xxx_power.c @@ -848,7 +848,7 @@ static int ip5xxx_power_probe(struct i2c_client *client) fields =3D (const struct ip5xxx_regfield_config *)of_id->data; ip5xxx_setup_regs(dev, ip5xxx, fields); =20 - psy_cfg.of_node =3D dev->of_node; + psy_cfg.fwnode =3D dev_fwnode(dev); psy_cfg.drv_data =3D ip5xxx; =20 psy =3D devm_power_supply_register(dev, &ip5xxx_battery_desc, &psy_cfg); diff --git a/drivers/power/supply/lego_ev3_battery.c b/drivers/power/supply= /lego_ev3_battery.c index 9085de0ae1b2c6350604177ee8f5eab30d571f01..28454de057612a945c7926e4ee0= 89aeeff9e1a49 100644 --- a/drivers/power/supply/lego_ev3_battery.c +++ b/drivers/power/supply/lego_ev3_battery.c @@ -23,6 +23,7 @@ #include #include #include +#include =20 struct lego_ev3_battery { struct iio_channel *iio_v; @@ -198,7 +199,7 @@ static int lego_ev3_battery_probe(struct platform_devic= e *pdev) batt->v_min =3D 48000000; } =20 - psy_cfg.of_node =3D pdev->dev.of_node; + psy_cfg.fwnode =3D dev_fwnode(&pdev->dev); psy_cfg.drv_data =3D batt; =20 batt->psy =3D devm_power_supply_register(dev, &lego_ev3_battery_desc, diff --git a/drivers/power/supply/lt3651-charger.c b/drivers/power/supply/l= t3651-charger.c index 8de500ffad95a5b0e7460155e186e5eeee206d96..ebfbdbcb7683216f01c37a2c39c= 1b30e22b00b53 100644 --- a/drivers/power/supply/lt3651-charger.c +++ b/drivers/power/supply/lt3651-charger.c @@ -131,7 +131,7 @@ static int lt3651_charger_probe(struct platform_device = *pdev) charger_desc->properties =3D lt3651_charger_properties; charger_desc->num_properties =3D ARRAY_SIZE(lt3651_charger_properties); charger_desc->get_property =3D lt3651_charger_get_property; - psy_cfg.of_node =3D pdev->dev.of_node; + psy_cfg.fwnode =3D dev_fwnode(&pdev->dev); psy_cfg.drv_data =3D lt3651_charger; =20 lt3651_charger->charger =3D devm_power_supply_register(&pdev->dev, diff --git a/drivers/power/supply/ltc4162-l-charger.c b/drivers/power/suppl= y/ltc4162-l-charger.c index 23eb426295dbbb4ffd3f69dbe47f51df5136497b..e276668b803d2ee2436b9d7eeb5= 0afd4de97a72f 100644 --- a/drivers/power/supply/ltc4162-l-charger.c +++ b/drivers/power/supply/ltc4162-l-charger.c @@ -1185,7 +1185,7 @@ static int ltc4162l_probe(struct i2c_client *client) if (!device_property_read_u32(dev, "lltc,cell-count", &value)) info->cell_count =3D value; =20 - ltc4162l_config.of_node =3D dev->of_node; + ltc4162l_config.fwnode =3D dev_fwnode(dev); ltc4162l_config.drv_data =3D info; ltc4162l_config.attr_grp =3D ltc4162l_attr_groups; =20 diff --git a/drivers/power/supply/max17042_battery.c b/drivers/power/supply= /max17042_battery.c index 655b3f25dbd7ca78f530aee3663cbe241722c3cf..acea176101fa88ff2e5a9187be1= 7575c8278d097 100644 --- a/drivers/power/supply/max17042_battery.c +++ b/drivers/power/supply/max17042_battery.c @@ -1066,7 +1066,7 @@ static int max17042_probe(struct i2c_client *client, = struct device *dev, int irq =20 dev_set_drvdata(dev, chip); psy_cfg.drv_data =3D chip; - psy_cfg.of_node =3D dev->of_node; + psy_cfg.fwnode =3D dev_fwnode(dev); =20 /* When current is not measured, * CURRENT_NOW and CURRENT_AVG properties should be invisible. */ diff --git a/drivers/power/supply/max77650-charger.c b/drivers/power/supply= /max77650-charger.c index 5f58c0c24b4d63bad410ea086c6ccf6b2a6fcf15..4ae43668992ecda319966ffd097= 34986187cd653 100644 --- a/drivers/power/supply/max77650-charger.c +++ b/drivers/power/supply/max77650-charger.c @@ -298,7 +298,7 @@ static int max77650_charger_probe(struct platform_devic= e *pdev) =20 chg->dev =3D dev; =20 - pscfg.of_node =3D dev->of_node; + pscfg.fwnode =3D dev_fwnode(dev); pscfg.drv_data =3D chg; =20 chg_irq =3D platform_get_irq_byname(pdev, "CHG"); diff --git a/drivers/power/supply/max8903_charger.c b/drivers/power/supply/= max8903_charger.c index e65d0141f260b1094393f6ecd26e810da4329bce..45fbaad6c6470ad51c6a9d2fefb= 3d7d1f4f2f4b3 100644 --- a/drivers/power/supply/max8903_charger.c +++ b/drivers/power/supply/max8903_charger.c @@ -349,7 +349,7 @@ static int max8903_probe(struct platform_device *pdev) data->psy_desc.properties =3D max8903_charger_props; data->psy_desc.num_properties =3D ARRAY_SIZE(max8903_charger_props); =20 - psy_cfg.of_node =3D dev->of_node; + psy_cfg.fwnode =3D dev_fwnode(dev); psy_cfg.drv_data =3D data; =20 data->psy =3D devm_power_supply_register(dev, &data->psy_desc, &psy_cfg); diff --git a/drivers/power/supply/mm8013.c b/drivers/power/supply/mm8013.c index 4adf2acc2779366323e52c467cff4f99ebb9d6ea..93c50cff31bca3b7d526d67b22e= e1f64e3f29add 100644 --- a/drivers/power/supply/mm8013.c +++ b/drivers/power/supply/mm8013.c @@ -274,7 +274,7 @@ static int mm8013_probe(struct i2c_client *client) return dev_err_probe(dev, ret, "MM8013 not found\n"); =20 psy_cfg.drv_data =3D chip; - psy_cfg.of_node =3D dev->of_node; + psy_cfg.fwnode =3D dev_fwnode(dev); =20 psy =3D devm_power_supply_register(dev, &mm8013_desc, &psy_cfg); if (IS_ERR(psy)) diff --git a/drivers/power/supply/mt6360_charger.c b/drivers/power/supply/m= t6360_charger.c index e99e551489761aa3b70ef33f8b65d59a8e117166..77747eb51667230008e2318543e= 6cdf0aab3664a 100644 --- a/drivers/power/supply/mt6360_charger.c +++ b/drivers/power/supply/mt6360_charger.c @@ -810,7 +810,7 @@ static int mt6360_charger_probe(struct platform_device = *pdev) memcpy(&mci->psy_desc, &mt6360_charger_desc, sizeof(mci->psy_desc)); mci->psy_desc.name =3D dev_name(&pdev->dev); charger_cfg.drv_data =3D mci; - charger_cfg.of_node =3D pdev->dev.of_node; + charger_cfg.fwnode =3D dev_fwnode(&pdev->dev); mci->psy =3D devm_power_supply_register(&pdev->dev, &mci->psy_desc, &charger_cfg); if (IS_ERR(mci->psy)) diff --git a/drivers/power/supply/mt6370-charger.c b/drivers/power/supply/m= t6370-charger.c index ad8793bf997e15a7d6a6bca96e538e6056bb3153..a6939c6059c7fd0da08087d87fd= af2244914d222 100644 --- a/drivers/power/supply/mt6370-charger.c +++ b/drivers/power/supply/mt6370-charger.c @@ -752,7 +752,7 @@ static int mt6370_chg_init_psy(struct mt6370_priv *priv) { struct power_supply_config cfg =3D { .drv_data =3D priv, - .of_node =3D dev_of_node(priv->dev), + .fwnode =3D dev_fwnode(priv->dev), }; =20 priv->psy =3D devm_power_supply_register(priv->dev, &mt6370_chg_psy_desc, diff --git a/drivers/power/supply/olpc_battery.c b/drivers/power/supply/olp= c_battery.c index 849f63e89ba09047bba30813723512780b9cdeb0..b9b6078226763459ad805db266d= 6e52d6de057ee 100644 --- a/drivers/power/supply/olpc_battery.c +++ b/drivers/power/supply/olpc_battery.c @@ -674,7 +674,7 @@ static int olpc_battery_probe(struct platform_device *p= dev) =20 /* Ignore the status. It doesn't actually matter */ =20 - ac_psy_cfg.of_node =3D pdev->dev.of_node; + ac_psy_cfg.fwnode =3D dev_fwnode(&pdev->dev); ac_psy_cfg.drv_data =3D data; =20 data->olpc_ac =3D devm_power_supply_register(&pdev->dev, &olpc_ac_desc, @@ -692,7 +692,7 @@ static int olpc_battery_probe(struct platform_device *p= dev) olpc_bat_desc.num_properties =3D ARRAY_SIZE(olpc_xo1_bat_props); } =20 - bat_psy_cfg.of_node =3D pdev->dev.of_node; + bat_psy_cfg.fwnode =3D dev_fwnode(&pdev->dev); bat_psy_cfg.drv_data =3D data; bat_psy_cfg.attr_grp =3D olpc_bat_sysfs_groups; =20 diff --git a/drivers/power/supply/pm8916_bms_vm.c b/drivers/power/supply/pm= 8916_bms_vm.c index 5d0dd842509c4b90853b23266a30c6cae172fc53..5120be086e6ffc6bb86f297a671= 92b29e2162d43 100644 --- a/drivers/power/supply/pm8916_bms_vm.c +++ b/drivers/power/supply/pm8916_bms_vm.c @@ -210,7 +210,7 @@ static int pm8916_bms_vm_battery_probe(struct platform_= device *pdev) bat->vbat_now =3D bat->last_ocv; =20 psy_cfg.drv_data =3D bat; - psy_cfg.of_node =3D dev->of_node; + psy_cfg.fwnode =3D dev_fwnode(dev); =20 bat->battery =3D devm_power_supply_register(dev, &pm8916_bms_vm_battery_p= sy_desc, &psy_cfg); if (IS_ERR(bat->battery)) diff --git a/drivers/power/supply/pm8916_lbc.c b/drivers/power/supply/pm891= 6_lbc.c index 6d92e98cbecc682768bf8c6048735b4687088186..c74b75b1b2676c3dfbb782dad04= 8c8356cc0e951 100644 --- a/drivers/power/supply/pm8916_lbc.c +++ b/drivers/power/supply/pm8916_lbc.c @@ -322,7 +322,7 @@ static int pm8916_lbc_charger_probe(struct platform_dev= ice *pdev) dev_err_probe(dev, ret, "Error while parsing device tree\n"); =20 psy_cfg.drv_data =3D chg; - psy_cfg.of_node =3D dev->of_node; + psy_cfg.fwnode =3D dev_fwnode(dev); =20 chg->charger =3D devm_power_supply_register(dev, &pm8916_lbc_charger_psy_= desc, &psy_cfg); if (IS_ERR(chg->charger)) diff --git a/drivers/power/supply/qcom_battmgr.c b/drivers/power/supply/qco= m_battmgr.c index 47d29271ddf400b76dd5b0a1b8d1ba86c017afc0..fe27676fbc7cd12292caa6fb3b5= b46a18c426e6d 100644 --- a/drivers/power/supply/qcom_battmgr.c +++ b/drivers/power/supply/qcom_battmgr.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -1336,10 +1337,10 @@ static int qcom_battmgr_probe(struct auxiliary_devi= ce *adev, battmgr->dev =3D dev; =20 psy_cfg.drv_data =3D battmgr; - psy_cfg.of_node =3D adev->dev.of_node; + psy_cfg.fwnode =3D dev_fwnode(&adev->dev); =20 psy_cfg_supply.drv_data =3D battmgr; - psy_cfg_supply.of_node =3D adev->dev.of_node; + psy_cfg_supply.fwnode =3D dev_fwnode(&adev->dev); psy_cfg_supply.supplied_to =3D qcom_battmgr_battery; psy_cfg_supply.num_supplicants =3D 1; =20 diff --git a/drivers/power/supply/qcom_pmi8998_charger.c b/drivers/power/su= pply/qcom_pmi8998_charger.c index 3b4132376649e088d14753de05982e8ea0d18371..74a8d8ed8d9fa305416b1e543ec= f12846d557091 100644 --- a/drivers/power/supply/qcom_pmi8998_charger.c +++ b/drivers/power/supply/qcom_pmi8998_charger.c @@ -964,7 +964,7 @@ static int smb2_probe(struct platform_device *pdev) return rc; =20 supply_config.drv_data =3D chip; - supply_config.of_node =3D pdev->dev.of_node; + supply_config.fwnode =3D dev_fwnode(&pdev->dev); =20 desc =3D devm_kzalloc(chip->dev, sizeof(smb2_psy_desc), GFP_KERNEL); if (!desc) diff --git a/drivers/power/supply/qcom_smbb.c b/drivers/power/supply/qcom_s= mbb.c index a79563f6ff7a0c1b7d4aab85f6a42cc27fbb43ca..28afe758a2dabe31eaf753b9074= 67a667ab42f61 100644 --- a/drivers/power/supply/qcom_smbb.c +++ b/drivers/power/supply/qcom_smbb.c @@ -880,7 +880,7 @@ static int smbb_charger_probe(struct platform_device *p= dev) } =20 bat_cfg.drv_data =3D chg; - bat_cfg.of_node =3D pdev->dev.of_node; + bat_cfg.fwnode =3D dev_fwnode(&pdev->dev); chg->bat_psy =3D devm_power_supply_register(&pdev->dev, &bat_psy_desc, &bat_cfg); diff --git a/drivers/power/supply/rk817_charger.c b/drivers/power/supply/rk= 817_charger.c index e5f35d083c23d5d86b3dca454f666383f828e524..945c7720c4ae905e2f0204cbef1= 534f7ec2a3a62 100644 --- a/drivers/power/supply/rk817_charger.c +++ b/drivers/power/supply/rk817_charger.c @@ -1088,7 +1088,7 @@ static int rk817_charger_probe(struct platform_device= *pdev) rk817_bat_calib_vol(charger); =20 pscfg.drv_data =3D charger; - pscfg.of_node =3D node; + pscfg.fwnode =3D node ? &node->fwnode : NULL; =20 /* * Get sample resistor value. Note only values of 10000 or 20000 diff --git a/drivers/power/supply/rt5033_battery.c b/drivers/power/supply/r= t5033_battery.c index 7a27b262fb84a73db82b12e97c2fb57162709e14..b2674adfa30b41475abae1d6973= a37272dbcfb92 100644 --- a/drivers/power/supply/rt5033_battery.c +++ b/drivers/power/supply/rt5033_battery.c @@ -160,7 +160,7 @@ static int rt5033_battery_probe(struct i2c_client *clie= nt) } =20 i2c_set_clientdata(client, battery); - psy_cfg.of_node =3D client->dev.of_node; + psy_cfg.fwnode =3D dev_fwnode(&client->dev); psy_cfg.drv_data =3D battery; =20 battery->psy =3D devm_power_supply_register(&client->dev, diff --git a/drivers/power/supply/rt5033_charger.c b/drivers/power/supply/r= t5033_charger.c index d19c7e80a92aa8f1f2f018e8e8d59ed0c58cc8a9..2fdc5843970754270754623ddf8= abf758c69e2cf 100644 --- a/drivers/power/supply/rt5033_charger.c +++ b/drivers/power/supply/rt5033_charger.c @@ -16,6 +16,7 @@ #include #include #include +#include =20 struct rt5033_charger_data { unsigned int pre_uamp; @@ -675,7 +676,7 @@ static int rt5033_charger_probe(struct platform_device = *pdev) charger->regmap =3D dev_get_regmap(pdev->dev.parent, NULL); mutex_init(&charger->lock); =20 - psy_cfg.of_node =3D pdev->dev.of_node; + psy_cfg.fwnode =3D dev_fwnode(&pdev->dev); psy_cfg.drv_data =3D charger; =20 charger->psy =3D devm_power_supply_register(charger->dev, diff --git a/drivers/power/supply/rt9455_charger.c b/drivers/power/supply/r= t9455_charger.c index 64a23e3d7bb00f03a548a551d3fd523299fd00cd..4b714b4c3e2b596280f09901f68= dbae9296d8605 100644 --- a/drivers/power/supply/rt9455_charger.c +++ b/drivers/power/supply/rt9455_charger.c @@ -1658,7 +1658,7 @@ static int rt9455_probe(struct i2c_client *client) INIT_DEFERRABLE_WORK(&info->batt_presence_work, rt9455_batt_presence_work_callback); =20 - rt9455_charger_config.of_node =3D dev->of_node; + rt9455_charger_config.fwnode =3D dev_fwnode(dev); rt9455_charger_config.drv_data =3D info; rt9455_charger_config.supplied_to =3D rt9455_charger_supplied_to; rt9455_charger_config.num_supplicants =3D diff --git a/drivers/power/supply/rt9467-charger.c b/drivers/power/supply/r= t9467-charger.c index 235169c85c5d8a8014ff585b6740aaec3243a068..e9aba9ad393c9cec309c49e7fb2= 1286f77555261 100644 --- a/drivers/power/supply/rt9467-charger.c +++ b/drivers/power/supply/rt9467-charger.c @@ -826,7 +826,7 @@ static int rt9467_register_psy(struct rt9467_chg_data *= data) { struct power_supply_config cfg =3D { .drv_data =3D data, - .of_node =3D dev_of_node(data->dev), + .fwnode =3D dev_fwnode(data->dev), .attr_grp =3D rt9467_sysfs_groups, }; =20 diff --git a/drivers/power/supply/rt9471.c b/drivers/power/supply/rt9471.c index 67b86ac91a21ddc0e3d0271b5f535c47600bc101..bd966abb4df5767f6f0353d08ea= 0eac2c3972b5b 100644 --- a/drivers/power/supply/rt9471.c +++ b/drivers/power/supply/rt9471.c @@ -723,7 +723,7 @@ static int rt9471_register_psy(struct rt9471_chip *chip) char *psy_name; =20 cfg.drv_data =3D chip; - cfg.of_node =3D dev->of_node; + cfg.fwnode =3D dev_fwnode(dev); cfg.attr_grp =3D rt9471_sysfs_groups; =20 psy_name =3D devm_kasprintf(dev, GFP_KERNEL, "rt9471-%s", dev_name(dev)); diff --git a/drivers/power/supply/sbs-battery.c b/drivers/power/supply/sbs-= battery.c index 6f3d0413b1c127fc4c5a16728d71be8ae340d05d..943c82ee978f40abd2b1f2ecd48= 50cf3b41fd446 100644 --- a/drivers/power/supply/sbs-battery.c +++ b/drivers/power/supply/sbs-battery.c @@ -1138,7 +1138,7 @@ static int sbs_probe(struct i2c_client *client) =20 chip->flags =3D (uintptr_t)i2c_get_match_data(client); chip->client =3D client; - psy_cfg.of_node =3D client->dev.of_node; + psy_cfg.fwnode =3D dev_fwnode(&client->dev); psy_cfg.drv_data =3D chip; chip->last_state =3D POWER_SUPPLY_STATUS_UNKNOWN; sbs_invalidate_cached_props(chip); diff --git a/drivers/power/supply/sbs-charger.c b/drivers/power/supply/sbs-= charger.c index ab3f095d90ea7c1c599aea61acce9138c37a269a..27764123b929e2357daf2967650= 6531a6f3f7664 100644 --- a/drivers/power/supply/sbs-charger.c +++ b/drivers/power/supply/sbs-charger.c @@ -173,7 +173,7 @@ static int sbs_probe(struct i2c_client *client) return -ENOMEM; =20 chip->client =3D client; - psy_cfg.of_node =3D client->dev.of_node; + psy_cfg.fwnode =3D dev_fwnode(&client->dev); psy_cfg.drv_data =3D chip; =20 i2c_set_clientdata(client, chip); diff --git a/drivers/power/supply/sbs-manager.c b/drivers/power/supply/sbs-= manager.c index 7d2f39f19acbf00d2d29850cd97063bb5f02eb3c..869729dfcd664c061dfff1bff30= ab756748d73d4 100644 --- a/drivers/power/supply/sbs-manager.c +++ b/drivers/power/supply/sbs-manager.c @@ -379,7 +379,7 @@ static int sbsm_probe(struct i2c_client *client) return ret; =20 psy_cfg.drv_data =3D data; - psy_cfg.of_node =3D dev->of_node; + psy_cfg.fwnode =3D dev_fwnode(dev); data->psy =3D devm_power_supply_register(dev, psy_desc, &psy_cfg); if (IS_ERR(data->psy)) return dev_err_probe(dev, PTR_ERR(data->psy), diff --git a/drivers/power/supply/sc2731_charger.c b/drivers/power/supply/s= c2731_charger.c index 50d5157af9277dc09fe24852747f4f62e72bc712..58b86fd78771360f74ffdad152c= 3905e1bee7c1b 100644 --- a/drivers/power/supply/sc2731_charger.c +++ b/drivers/power/supply/sc2731_charger.c @@ -480,7 +480,7 @@ static int sc2731_charger_probe(struct platform_device = *pdev) } =20 charger_cfg.drv_data =3D info; - charger_cfg.of_node =3D np; + charger_cfg.fwnode =3D dev_fwnode(&pdev->dev); info->psy_usb =3D devm_power_supply_register(&pdev->dev, &sc2731_charger_desc, &charger_cfg); diff --git a/drivers/power/supply/sc27xx_fuel_gauge.c b/drivers/power/suppl= y/sc27xx_fuel_gauge.c index f36edc2ba708748d0ceb61298056f8c905aca012..196d96cd986266738785d8582e9= 07858faaf2ba3 100644 --- a/drivers/power/supply/sc27xx_fuel_gauge.c +++ b/drivers/power/supply/sc27xx_fuel_gauge.c @@ -1141,7 +1141,6 @@ static int sc27xx_fgu_hw_init(struct sc27xx_fgu_data = *data) static int sc27xx_fgu_probe(struct platform_device *pdev) { struct device *dev =3D &pdev->dev; - struct device_node *np =3D dev->of_node; struct power_supply_config fgu_cfg =3D { }; struct sc27xx_fgu_data *data; int ret, irq; @@ -1205,7 +1204,7 @@ static int sc27xx_fgu_probe(struct platform_device *p= dev) platform_set_drvdata(pdev, data); =20 fgu_cfg.drv_data =3D data; - fgu_cfg.of_node =3D np; + fgu_cfg.fwnode =3D dev_fwnode(dev); data->battery =3D devm_power_supply_register(dev, &sc27xx_fgu_desc, &fgu_cfg); if (IS_ERR(data->battery)) { diff --git a/drivers/power/supply/smb347-charger.c b/drivers/power/supply/s= mb347-charger.c index c8392933ee285255438a78f5bbd9429f9f1c6764..893551dce7d2c9902df5a614193= 5661b342c00f9 100644 --- a/drivers/power/supply/smb347-charger.c +++ b/drivers/power/supply/smb347-charger.c @@ -1553,7 +1553,7 @@ static int smb347_probe(struct i2c_client *client) return PTR_ERR(smb->regmap); =20 mains_usb_cfg.drv_data =3D smb; - mains_usb_cfg.of_node =3D dev->of_node; + mains_usb_cfg.fwnode =3D dev_fwnode(dev); if (smb->use_mains) { smb->mains =3D devm_power_supply_register(dev, &smb347_mains_desc, &mains_usb_cfg); diff --git a/drivers/power/supply/tps65090-charger.c b/drivers/power/supply= /tps65090-charger.c index d65193e410a6251e80e481ed6fc3d36128c5678c..d010f013af8cec790d135b651fb= c6330c8907b0e 100644 --- a/drivers/power/supply/tps65090-charger.c +++ b/drivers/power/supply/tps65090-charger.c @@ -259,7 +259,7 @@ static int tps65090_charger_probe(struct platform_devic= e *pdev) =20 psy_cfg.supplied_to =3D pdata->supplied_to; psy_cfg.num_supplicants =3D pdata->num_supplicants; - psy_cfg.of_node =3D pdev->dev.of_node; + psy_cfg.fwnode =3D dev_fwnode(&pdev->dev); psy_cfg.drv_data =3D cdata; =20 cdata->ac =3D devm_power_supply_register(&pdev->dev, &tps65090_charger_de= sc, diff --git a/drivers/power/supply/tps65217_charger.c b/drivers/power/supply= /tps65217_charger.c index 6fff44e1ecac80797fd33cdc3c10b0c23ce19c28..6af17ce0b2040bb3ba5835c6dc1= 3b867f316141d 100644 --- a/drivers/power/supply/tps65217_charger.c +++ b/drivers/power/supply/tps65217_charger.c @@ -198,7 +198,7 @@ static int tps65217_charger_probe(struct platform_devic= e *pdev) charger->tps =3D tps; charger->dev =3D &pdev->dev; =20 - cfg.of_node =3D pdev->dev.of_node; + cfg.fwnode =3D dev_fwnode(&pdev->dev); cfg.drv_data =3D charger; =20 charger->psy =3D devm_power_supply_register(&pdev->dev, diff --git a/drivers/power/supply/ucs1002_power.c b/drivers/power/supply/uc= s1002_power.c index 7382bec6a43c776119bbcfd9070d6ca9629ab810..d32a7633f9e7d725cecf6659ed5= b49c4fe2accd5 100644 --- a/drivers/power/supply/ucs1002_power.c +++ b/drivers/power/supply/ucs1002_power.c @@ -560,7 +560,7 @@ static int ucs1002_probe(struct i2c_client *client) irq_a_det =3D of_irq_get_byname(dev->of_node, "a_det"); irq_alert =3D of_irq_get_byname(dev->of_node, "alert"); =20 - charger_config.of_node =3D dev->of_node; + charger_config.fwnode =3D dev_fwnode(dev); charger_config.drv_data =3D info; =20 ret =3D regmap_read(info->regmap, UCS1002_REG_PRODUCT_ID, ®val); --=20 2.47.2