diff options
| author | Magnus Damm <damm+renesas@opensource.se> | 2014-06-06 11:21:11 +0400 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2014-06-26 11:01:27 +0400 |
| commit | 8e26118d44c4877fa52dc8117692f3cc9af3c769 (patch) | |
| tree | 8b7e42cf809f4c462caa61eb69516cc48e27de63 /arch/arm/mach-shmobile/pm-r8a7791.c | |
| parent | 06f2c5dcc24b026872bfc9b50b47c384638d2111 (diff) | |
| download | linux-8e26118d44c4877fa52dc8117692f3cc9af3c769.tar.xz | |
ARM: shmobile: Move r8a7791 reset code to pm-r8a7791.c
Move r8a7791 specific reset vector setup code from the
SMP glue code to PM code. This makes the code one step
closer to allow PM operations such as Suspend-to-RAM
in the case when SMP is disabled in the kernel config.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
[horms+renesas@verge.net.au: updated for recent header file changes]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile/pm-r8a7791.c')
| -rw-r--r-- | arch/arm/mach-shmobile/pm-r8a7791.c | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/pm-r8a7791.c b/arch/arm/mach-shmobile/pm-r8a7791.c index b7e6513fb38a..c44304c3c6df 100644 --- a/arch/arm/mach-shmobile/pm-r8a7791.c +++ b/arch/arm/mach-shmobile/pm-r8a7791.c @@ -11,12 +11,17 @@ */ #include <linux/kernel.h> - +#include <linux/smp.h> #include <asm/io.h> - +#include "common.h" #include "pm-rcar.h" #include "r8a7791.h" +#define RST 0xe6160000 +#define CA15BAR 0x0020 +#define CA15RESCNT 0x0040 +#define RAM 0xe6300000 + /* SYSC */ #define SYSCIER 0x0c #define SYSCIMR 0x10 @@ -40,10 +45,28 @@ static inline void r8a7791_sysc_init(void) {} void __init r8a7791_pm_init(void) { + void __iomem *p; + u32 bar; static int once; if (once++) return; + /* RAM for jump stub, because BAR requires 256KB aligned address */ + p = ioremap_nocache(RAM, shmobile_boot_size); + memcpy_toio(p, shmobile_boot_vector, shmobile_boot_size); + iounmap(p); + + /* setup reset vectors */ + p = ioremap_nocache(RST, 0x63); + bar = (RAM >> 8) & 0xfffffc00; + writel_relaxed(bar, p + CA15BAR); + writel_relaxed(bar | 0x10, p + CA15BAR); + + /* enable clocks to all CPUs */ + writel_relaxed((readl_relaxed(p + CA15RESCNT) & ~0x0f) | 0xa5a50000, + p + CA15RESCNT); + iounmap(p); + r8a7791_sysc_init(); } |