diff options
author | Magnus Damm <damm+renesas@opensource.se> | 2014-06-06 16:21:11 +0900 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2014-06-26 16:01:27 +0900 |
commit | 8e26118d44c4877fa52dc8117692f3cc9af3c769 (patch) | |
tree | 8b7e42cf809f4c462caa61eb69516cc48e27de63 /arch/arm/mach-shmobile/smp-r8a7791.c | |
parent | 06f2c5dcc24b026872bfc9b50b47c384638d2111 (diff) | |
download | linux-8e26118d44c4877fa52dc8117692f3cc9af3c769.tar.gz linux-8e26118d44c4877fa52dc8117692f3cc9af3c769.tar.bz2 linux-8e26118d44c4877fa52dc8117692f3cc9af3c769.zip |
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/smp-r8a7791.c')
-rw-r--r-- | arch/arm/mach-shmobile/smp-r8a7791.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/arch/arm/mach-shmobile/smp-r8a7791.c b/arch/arm/mach-shmobile/smp-r8a7791.c index 248255524127..df086aa79630 100644 --- a/arch/arm/mach-shmobile/smp-r8a7791.c +++ b/arch/arm/mach-shmobile/smp-r8a7791.c @@ -24,35 +24,11 @@ #include "r8a7791.h" #include "rcar-gen2.h" -#define RST 0xe6160000 -#define CA15BAR 0x0020 -#define CA15RESCNT 0x0040 -#define RAM 0xe6300000 - static void __init r8a7791_smp_prepare_cpus(unsigned int max_cpus) { - void __iomem *p; - u32 bar; - /* let APMU code install data related to shmobile_boot_vector */ shmobile_smp_apmu_prepare_cpus(max_cpus); - /* 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_pm_init(); shmobile_smp_apmu_suspend_init(); } |