Commit b547f9b3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 5ea0cf77 7e6311f0

Documentation/ABI/testing/sysfs-platform-power-on-reason

0 → 100644
+12 −0
Original line number Diff line number Diff line 
What:		/sys/devices/platform/.../power_on_reason

Date:		June 2023

KernelVersion:	6.5

Contact:	Kamel Bouhara <kamel.bouhara@bootlin.com>

Description:	Shows system power on reason. The following strings/reasons can

		be read (the list can be extended):

		"regular power-up", "RTC wakeup", "watchdog timeout",

		"software reset", "reset button action", "CPU clock failure",

		"crystal oscillator failure", "brown-out reset",

		"unknown reason".



		The file is read only.

drivers/power/reset/Kconfig

+0 −7
Original line number Diff line number Diff line
@@ -148,13 +148,6 @@ config POWER_RESET_ODROID_GO_ULTRA_POWEROFF 
	help

	  This driver supports Power off for Odroid Go Ultra device.



config POWER_RESET_OXNAS

	bool "OXNAS SoC restart driver"

	depends on ARCH_OXNAS

	default MACH_OX820

	help

	  Restart support for OXNAS/PLXTECH OX820 SoC.



config POWER_RESET_PIIX4_POWEROFF

	tristate "Intel PIIX4 power-off driver"

	depends on PCI

drivers/power/reset/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ obj-$(CONFIG_POWER_RESET_HISI) += hisi-reboot.o 
obj-$(CONFIG_POWER_RESET_LINKSTATION) += linkstation-poweroff.o

obj-$(CONFIG_POWER_RESET_MSM) += msm-poweroff.o

obj-$(CONFIG_POWER_RESET_MT6323) += mt6323-poweroff.o

obj-$(CONFIG_POWER_RESET_OXNAS) += oxnas-restart.o

obj-$(CONFIG_POWER_RESET_QCOM_PON) += qcom-pon.o

obj-$(CONFIG_POWER_RESET_OCELOT_RESET) += ocelot-reset.o

obj-$(CONFIG_POWER_RESET_ODROID_GO_ULTRA_POWEROFF) += odroid-go-ultra-poweroff.o

drivers/power/reset/as3722-poweroff.c

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include <linux/mfd/as3722.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/platform_device.h>

#include <linux/slab.h>

drivers/power/reset/at91-poweroff.c

+1 −3
Original line number Diff line number Diff line
@@ -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);