| From 5ca09bd090c714057b5ca0dde536f296750d40b1 Mon Sep 17 00:00:00 2001 |
| From: Keita Kobayashi <keita.kobayashi.ym@renesas.com> |
| Date: Wed, 15 Jan 2014 21:26:13 +0900 |
| Subject: ARM: shmobile: r8a7790 CA15-SCU enablement |
| |
| Power on CA15 SCU in case of booting from a CA7 core. |
| |
| Signed-off-by: Keita Kobayashi <keita.kobayashi.ym@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> |
| |
| (cherry picked from commit c2c97ec513b503b9e0d28ffd98d54c9e9bf3ea3e) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/smp-r8a7790.c | 6 ++++++ |
| 1 file changed, 6 insertions(+) |
| |
| diff --git a/arch/arm/mach-shmobile/smp-r8a7790.c b/arch/arm/mach-shmobile/smp-r8a7790.c |
| index beb47ae9d05a..591052799e8f 100644 |
| --- a/arch/arm/mach-shmobile/smp-r8a7790.c |
| +++ b/arch/arm/mach-shmobile/smp-r8a7790.c |
| @@ -29,6 +29,11 @@ |
| #define CA7RESCNT 0x0044 |
| #define MERAM 0xe8080000 |
| |
| +static struct rcar_sysc_ch r8a7790_ca15_scu = { |
| + .chan_offs = 0x180, /* PWRSR5 .. PWRER5 */ |
| + .isr_bit = 12, /* CA15-SCU */ |
| +}; |
| + |
| static struct rcar_sysc_ch r8a7790_ca7_scu = { |
| .chan_offs = 0x100, /* PWRSR3 .. PWRER3 */ |
| .isr_bit = 21, /* CA7-SCU */ |
| @@ -64,6 +69,7 @@ static void __init r8a7790_smp_prepare_cpus(unsigned int max_cpus) |
| |
| /* turn on power to SCU */ |
| r8a7790_pm_init(); |
| + rcar_sysc_power_up(&r8a7790_ca15_scu); |
| rcar_sysc_power_up(&r8a7790_ca7_scu); |
| } |
| |
| -- |
| 2.1.2 |
| |
