Unverified Commit 9c6cb037 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-soc-6.13' of... 

Merge tag 'imx-soc-6.13' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/arm

i.MX SoC changes for 6.13:

- A change from Andrew Davis to convert i.MX6 PM code to use new
  sys-off API

* tag 'imx-soc-6.13' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx: Switch to new sys-off handler API

Link: https://lore.kernel.org/r/20241104090055.1881860-2-shawnguo2@yeah.net


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d95fa0fa 2f769899

arch/arm/mach-imx/pm-imx6.c

+2 −4
Original line number Diff line number Diff line
@@ -634,13 +634,11 @@ static void imx6_pm_stby_poweroff(void) 


static int imx6_pm_stby_poweroff_probe(void)

{

	if (pm_power_off) {

		pr_warn("%s: pm_power_off already claimed  %p %ps!\n",

			__func__, pm_power_off, pm_power_off);

	if (register_platform_power_off(imx6_pm_stby_poweroff)) {

		pr_warn("%s: platform power off already claimed!\n", __func__);

		return -EBUSY;

	}



	pm_power_off = imx6_pm_stby_poweroff;

	return 0;

}