aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile
diff options
context:
space:
mode:
authorGaku Inami <gaku.inami.xw@bp.renesas.com>2014-01-15 21:26:04 +0900
committerSimon Horman <horms+renesas@verge.net.au>2014-02-24 08:55:47 +0900
commit0445ded61aac0c1a6f43b4be1a2ca2ca47b77eb8 (patch)
tree1ba15bc47d29e78b69caa6b2b273fcb4df06348e /arch/arm/mach-shmobile
parentARM: shmobile: r8a7790 SYSC setup code (diff)
downloadlinux-dev-0445ded61aac0c1a6f43b4be1a2ca2ca47b77eb8.tar.xz
linux-dev-0445ded61aac0c1a6f43b4be1a2ca2ca47b77eb8.zip
ARM: shmobile: r8a7790 CA7-SCU enablement
Power on CA7 SCU in case of booting from a CA15 core. Signed-off-by: Gaku Inami <gaku.inami.xw@bp.renesas.com> [damm@opensource.se: Converted to use broken out SYSC code] Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile')
-rw-r--r--arch/arm/mach-shmobile/smp-r8a7790.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/smp-r8a7790.c b/arch/arm/mach-shmobile/smp-r8a7790.c
index 015e2753de1f..beb47ae9d05a 100644
--- a/arch/arm/mach-shmobile/smp-r8a7790.c
+++ b/arch/arm/mach-shmobile/smp-r8a7790.c
@@ -19,6 +19,8 @@
#include <linux/io.h>
#include <asm/smp_plat.h>
#include <mach/common.h>
+#include <mach/pm-rcar.h>
+#include <mach/r8a7790.h>
#define RST 0xe6160000
#define CA15BAR 0x0020
@@ -27,6 +29,11 @@
#define CA7RESCNT 0x0044
#define MERAM 0xe8080000
+static struct rcar_sysc_ch r8a7790_ca7_scu = {
+ .chan_offs = 0x100, /* PWRSR3 .. PWRER3 */
+ .isr_bit = 21, /* CA7-SCU */
+};
+
static void __init r8a7790_smp_prepare_cpus(unsigned int max_cpus)
{
void __iomem *p;
@@ -54,6 +61,10 @@ static void __init r8a7790_smp_prepare_cpus(unsigned int max_cpus)
writel_relaxed((readl_relaxed(p + CA7RESCNT) & ~0x0f) | 0x5a5a0000,
p + CA7RESCNT);
iounmap(p);
+
+ /* turn on power to SCU */
+ r8a7790_pm_init();
+ rcar_sysc_power_up(&r8a7790_ca7_scu);
}
struct smp_operations r8a7790_smp_ops __initdata = {