diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-08-29 08:37:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-08-29 08:37:03 -0700 |
| commit | b547f9b30091bbd91f8ad2c89db277425db812f9 (patch) | |
| tree | c171bc209d141e7e5bc22ed0fa3f8e341e8c7253 /drivers/power/reset/at91-poweroff.c | |
| parent | 5ea0cf77583ec768c8e2403ecb2a930fa948b444 (diff) | |
| parent | 7e6311f04b41174ccc738d37dcb4b93cd4de98b0 (diff) | |
Merge tag 'for-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
Pull power supply and reset updates from Sebastian Reichel:
- core: avoid duplicate hwmon device from thermal framework
- convert multiple drivers to devm_platform_ioremap_resource
- at91-reset: add sysfs interface to the power on reason
- misc small fixes and improvements
* tag 'for-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
power: supply: qcom_pmi8998_charger: fix charger status
power: supply: qcom_pmi8998_charger: remove CHARGE_CONTROL_LIMIT_* props
power: supply: qcom_pmi8998_charger: fix uninitialized variable
power: reset: oxnas-restart: remove obsolete restart driver
power: supply: core: Avoid duplicate hwmon device from thermal framework
power: reset: ocelot: Convert to devm_platform_ioremap_resource()
power: reset: msm: Convert to devm_platform_ioremap_resource()
power: reset: gemini-poweroff: Convert to devm_platform_ioremap_resource()
power: reset: brcm-kona: Convert to devm_platform_ioremap_resource()
power: reset: at91-sama5d2_shdwc: Convert to devm_platform_ioremap_resource()
power: reset: at91-poweroff: Convert to devm_platform_ioremap_resource()
power: reset: at91-reset: add sysfs interface to the power on reason
power: supply: bd99954: make read-only array sub_status_reg
power: supply: bq24190: Considers FORCE_20PCT when getting IPRECHG
power: Explicitly include correct DT includes
Diffstat (limited to 'drivers/power/reset/at91-poweroff.c')
| -rw-r--r-- | drivers/power/reset/at91-poweroff.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/power/reset/at91-poweroff.c b/drivers/power/reset/at91-poweroff.c index 9e74e131c675..dd5399785b69 100644 --- a/drivers/power/reset/at91-poweroff.c +++ b/drivers/power/reset/at91-poweroff.c @@ -151,13 +151,11 @@ static void at91_poweroff_dt_set_wakeup_mode(struct platform_device *pdev) static int __init at91_poweroff_probe(struct platform_device *pdev) { - struct resource *res; struct device_node *np; u32 ddr_type; int ret; - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - at91_shdwc.shdwc_base = devm_ioremap_resource(&pdev->dev, res); + at91_shdwc.shdwc_base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(at91_shdwc.shdwc_base)) return PTR_ERR(at91_shdwc.shdwc_base); |