diff options
author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2015-03-03 21:58:22 +0300 |
---|---|---|
committer | Zefan Li <lizefan@huawei.com> | 2015-06-19 06:40:23 +0300 |
commit | ec3be97f93fce5d56ecfdba46c1fc392fb564c90 (patch) | |
tree | f7e8e8387c4652957a8538b689661a30c7794064 /arch/arm | |
parent | bd637e58a1e3605bea04d6b503576765d2e3c7c5 (diff) | |
download | linux-ec3be97f93fce5d56ecfdba46c1fc392fb564c90.tar.xz |
ARM: at91: pm: fix at91rm9200 standby
commit 84e871660bebfddb9a62ebd6f19d02536e782f0a upstream.
at91rm9200 standby and suspend to ram has been broken since
00482a4078f4. It is wrongly using AT91_BASE_SYS which is a physical address
and actually doesn't correspond to any register on at91rm9200.
Use the correct at91_ramc_base[0] instead.
Fixes: 00482a4078f4 (ARM: at91: implement the standby function for pm/cpuidle)
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Zefan Li <lizefan@huawei.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-at91/pm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/pm.h b/arch/arm/mach-at91/pm.h index 89f56f3a802e..8c3f8e89d2ae 100644 --- a/arch/arm/mach-at91/pm.h +++ b/arch/arm/mach-at91/pm.h @@ -38,7 +38,7 @@ static inline void at91rm9200_standby(void) " mcr p15, 0, %0, c7, c0, 4\n\t" " str %5, [%1, %2]" : - : "r" (0), "r" (AT91_BASE_SYS), "r" (AT91RM9200_SDRAMC_LPR), + : "r" (0), "r" (at91_ramc_base[0]), "r" (AT91RM9200_SDRAMC_LPR), "r" (1), "r" (AT91RM9200_SDRAMC_SRR), "r" (lpr)); } |