diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2024-11-13 01:14:50 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2024-11-13 01:14:50 +0300 |
| commit | 9c6cb0377534e77265ea673fd4834f858d5d1a6f (patch) | |
| tree | 16c86a96bd189a4f62f3a14eb60a3154814f74ea /arch | |
| parent | d95fa0fab7cab38a1778d804f1612f6af5bf7a86 (diff) | |
| parent | 2f76989999a7434e95fabf7d9d9f9449f746c827 (diff) | |
| download | linux-9c6cb0377534e77265ea673fd4834f858d5d1a6f.tar.xz | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-imx/pm-imx6.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/pm-imx6.c b/arch/arm/mach-imx/pm-imx6.c index b36f05b54cc7..a671ca498f88 100644 --- a/arch/arm/mach-imx/pm-imx6.c +++ b/arch/arm/mach-imx/pm-imx6.c @@ -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; } |