diff options
| author | Tom Rini <trini@konsulko.com> | 2023-08-16 11:23:58 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-08-16 11:23:58 -0400 |
| commit | 375fea811d3e45b47ee8a60f1f36a1d036660736 (patch) | |
| tree | a1453abc075dc3c602124909a13413219f425841 /arch/arm/mach-stm32mp/psci.c | |
| parent | 9b54b0e37b72aa9bfff09cbbe13465abfa143f84 (diff) | |
| parent | 9e8cbea1a74516235820ccd50d513c961e43cb70 (diff) | |
Merge tag 'u-boot-stm32-20230816' of https://source.denx.de/u-boot/custodians/u-boot-stm
DHSOM: Power cycle Buck3 in reset
DHCOM: Switch DWMAC RMII clock to MCO2
stm32f746: fix display pinmux
stm32mp: psci: Inhibit PDDS because CSTBYDIS is set
stm32mp1: DT alignment with v6.4
stm32mp1: add splashscreen with STMicroelectronics logo
stm32mp1: clk: remove error for disabled clock in stm32mp1_clk_get_parent
serial: stm32: Extend TC timeout
Diffstat (limited to 'arch/arm/mach-stm32mp/psci.c')
| -rw-r--r-- | arch/arm/mach-stm32mp/psci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-stm32mp/psci.c b/arch/arm/mach-stm32mp/psci.c index 39b5200949..8cdeb0ab3f 100644 --- a/arch/arm/mach-stm32mp/psci.c +++ b/arch/arm/mach-stm32mp/psci.c @@ -729,7 +729,7 @@ void __secure psci_system_suspend(u32 __always_unused function_id, setbits_le32(STM32_RCC_BASE + RCC_MP_CIER, RCC_MP_CIFR_WKUPF); setbits_le32(STM32_PWR_BASE + PWR_MPUCR, - PWR_MPUCR_CSSF | PWR_MPUCR_CSTDBYDIS | PWR_MPUCR_PDDS); + PWR_MPUCR_CSSF | PWR_MPUCR_CSTDBYDIS); saved_mcudivr = readl(STM32_RCC_BASE + RCC_MCUDIVR); saved_pll3cr = readl(STM32_RCC_BASE + RCC_PLL3CR); |