[PATCH 5.4 071/215] ARM: at91: pm: add quirk for sam9x60s ulp1

From: Greg Kroah-Hartman
Date: Mon Jul 20 2020 - 12:00:11 EST


From: Claudiu Beznea <claudiu.beznea@xxxxxxxxxxxxx>

[ Upstream commit bb1a0e87e1c54cd884e9b92b1cec06b186edc7a0 ]

On SAM9X60 2 nop operations has to be introduced after setting
WAITMODE bit in CKGR_MOR.

Signed-off-by: Claudiu Beznea <claudiu.beznea@xxxxxxxxxxxxx>
Signed-off-by: Alexandre Belloni <alexandre.belloni@xxxxxxxxxxx>
Link: https://lore.kernel.org/r/1579522208-19523-9-git-send-email-claudiu.beznea@xxxxxxxxxxxxx
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
---
arch/arm/mach-at91/pm_suspend.S | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/arch/arm/mach-at91/pm_suspend.S b/arch/arm/mach-at91/pm_suspend.S
index ed57c879d4e17..2591cba61937b 100644
--- a/arch/arm/mach-at91/pm_suspend.S
+++ b/arch/arm/mach-at91/pm_suspend.S
@@ -268,6 +268,10 @@ ENDPROC(at91_backup_mode)
orr tmp1, tmp1, #AT91_PMC_KEY
str tmp1, [pmc, #AT91_CKGR_MOR]

+ /* Quirk for SAM9X60's PMC */
+ nop
+ nop
+
wait_mckrdy

/* Enable the crystal oscillator */
--
2.25.1