Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-12-29 09:16:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

i.MX SoC changes for 6.13:

Browse Source 
- A change from Andrew Davis to convert i.MX6 PM code to use new
   sys-off API
 -----BEGIN PGP SIGNATURE-----
 
 iQFIBAABCgAyFiEEFmJXigPl4LoGSz08UFdYWoewfM4FAmcoe/MUHHNoYXduZ3Vv
 QGtlcm5lbC5vcmcACgkQUFdYWoewfM58Ogf/Z3+r8M479tEnIkCMMy64Fpl7KlTJ
 LvEZGChV7kaqTrwcE5HzW1sVbccNZbBVtXICjOfyleRI251dsxr3/c0DcduWxNM1
 Ss10x7yavWReJUCscLDiIDMKA6IIGR6z3V5BJUWj43iVdImIGWLgoJwbbWwKWn07
 qoc+S38gcws5JUSZtahEEIaOv98x8olOrFxKV5x0zMYK7tvD83rpmvxFFJFnbiXN
 DlPykFvIY42+G1QpHCiND0JzPpLAN9XZE62Rpt045OMKswJFTJR6+Wo0cpsCYIJE
 COOyTukXW1xgnYtsP2YL/Wpj40hk+bIr7WAu6GnT2ES3OIjwQNgyFsjyqA==
 =Q548
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmcz01oACgkQYKtH/8kJ
 UifZ4A//bf7ctofN4CBUtdwpS4FeQKgwVQzs4naI5t6idP2EmWSfPBeVOxwKpTB9
 6bKSuK2iVq3qf+o7rQC4RasHDylzGN442hVOXVs5h0rIYjQ3k5DXsMCk7VYzO+qZ
 8ycx5hFr6j5XNCweMyVc/QVITiwo4iIUKJ89xa1fvHyvB5zgB5vyTA0oyUFnyp2w
 Rv1c/9ovL3A5+lunTO35gpgW6qHf12Z4r1ihdMIpRy4JmHjwzXzBPS43AkBcC5ed
 qb8G4EHjFO1xcFuNcumvbvSZqGgsoUBiDS0kvWuvpRjAsmRNKb56XN7LEbTVvl0h
 Fgi5mnstWewpomswo7vEhT/PytqCB3+klkaozkXYjmParLrKXhU6k2+xuBfgn0ge
 VaZnijGyorV8cRmDFka2UDwyBdFmDrFHELiP35NWvHaKIfnulJQ3TrFKwWf4M8a+
 F3kPcp0faSJusFebm8YDIXJPkeG3MhcT7KyXFwhJTpXtBMJgqtxtttwT4VkRld0l
 gCC8FJvTX+YjqJ8wPz3/HEBxBnvbgg5jotOTdcS3Z/3ooLCVONMlU+hDQ0RFCxSe
 BFuYYkyNA5wvknWMgv8W024q6VVRut5quwFdgMibAcK1EH31o4V8USQKGT7h9vpJ
 cPkdIxCys4FJkrN54wTMfw16KvqOHhWFsIqXdPWr74gwKvlXkp4=
 =IX9G
 -----END PGP SIGNATURE-----

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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2024-11-12 23:14:50 +01:00
commit 9c6cb03775
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-imx/pm-imx6.c
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;
}