diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-12-22 13:38:35 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-12-22 13:38:35 +0300 |
| commit | 6248b4095f4044fc7c10db1058b197414815df50 (patch) | |
| tree | a781284d5942b594593b78aab5531eec4d50ad58 /arch/arm | |
| parent | 7eda5fe9684ffcbaf2adb0c300f1060fc826ce38 (diff) | |
| parent | aa1cfba75b77ca93ab9a0b03c2c9124a16d96479 (diff) | |
| download | linux-6248b4095f4044fc7c10db1058b197414815df50.tar.xz | |
Merge tag 'at91-soc-6.8' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into soc/arm
Microchip AT91 SoC updates for v6.8
It contains:
- one patch for secure mode to set the target power management mode in
initialization process as at91_pm_begin() is not called on suspend
path while in secure mode; this is necessary for different drivers to
know which suspend mode the system is going to switch to and act
accordingly
* tag 'at91-soc-6.8' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
ARM: at91: pm: set soc_pm.data.mode in at91_pm_secure_init()
Link: https://lore.kernel.org/r/20231214174830.3045180-1-claudiu.beznea@tuxon.dev
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-at91/pm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index 1a26af0fabc7..345b91dc6627 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -1103,6 +1103,7 @@ static void __init at91_pm_secure_init(void) if (res.a0 == 0) { pr_info("AT91: Secure PM: suspend mode set to %s\n", pm_modes[suspend_mode].pattern); + soc_pm.data.mode = suspend_mode; return; } @@ -1112,6 +1113,7 @@ static void __init at91_pm_secure_init(void) res = sam_smccc_call(SAMA5_SMC_SIP_GET_SUSPEND_MODE, 0, 0); if (res.a0 == 0) { pr_warn("AT91: Secure PM: failed to get default mode\n"); + soc_pm.data.mode = -1; return; } @@ -1119,6 +1121,7 @@ static void __init at91_pm_secure_init(void) pm_modes[suspend_mode].pattern); soc_pm.data.suspend_mode = res.a1; + soc_pm.data.mode = soc_pm.data.suspend_mode; } static const struct of_device_id atmel_shdwc_ids[] = { { .compatible = "atmel,sama5d2-shdwc" }, |