openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Magnus Damm 2014-06-06 16:21:11 +09:00 committed by Simon Horman
parent 06f2c5dcc2
commit 8e26118d44
2 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
arch/arm/mach-shmobile/pm-r8a7791.c
View File

@ -11,12 +11,17 @@
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/smp.h>
#include <asm/io.h> #include <asm/io.h>
#include "common.h"
#include "pm-rcar.h" #include "pm-rcar.h"
#include "r8a7791.h" #include "r8a7791.h"
#define RST 0xe6160000
#define CA15BAR 0x0020
#define CA15RESCNT 0x0040
#define RAM 0xe6300000
/* SYSC */ /* SYSC */
#define SYSCIER 0x0c #define SYSCIER 0x0c
#define SYSCIMR 0x10 #define SYSCIMR 0x10
@ -40,10 +45,28 @@ static inline void r8a7791_sysc_init(void) {}
void __init r8a7791_pm_init(void) void __init r8a7791_pm_init(void)
{ {
void __iomem *p;
u32 bar;
static int once; static int once;
if (once++) if (once++)
return; 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(); r8a7791_sysc_init();
} }

24
arch/arm/mach-shmobile/smp-r8a7791.c
View File

@ -24,35 +24,11 @@
#include "r8a7791.h" #include "r8a7791.h"
#include "rcar-gen2.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) 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 */ /* let APMU code install data related to shmobile_boot_vector */
shmobile_smp_apmu_prepare_cpus(max_cpus); 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(); r8a7791_pm_init();
shmobile_smp_apmu_suspend_init(); shmobile_smp_apmu_suspend_init();
} }