TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2024-11-12 23:14:50 +01:00
parent d95fa0fab7 2f76989999
commit 9c6cb03775
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/mach-imx/pm-imx6.c
+2 -4
View File
@@ -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;
}