| From 3e7b6a202d3d95e2dc0b12c2b6aba20bd93a8db3 Mon Sep 17 00:00:00 2001 |
| From: Magnus Damm <damm+renesas@opensource.se> |
| Date: Fri, 6 Jun 2014 16:21:19 +0900 |
| Subject: ARM: shmobile: Allow r8a7791 to build non-SMP APMU code |
| |
| Build the APMU for r8a7791 even though SMP is |
| disabled in the kernel config. Also initialize |
| Suspend-to-RAM from pm-r8a7791.c to in the future |
| cover both UP and SMP use cases of the APMU. |
| |
| Signed-off-by: Magnus Damm <damm+renesas@opensource.se> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit bfe4cfa8ae21628267f2b879b4396ee17ea4fd3a) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/Makefile | 5 +++-- |
| arch/arm/mach-shmobile/pm-r8a7791.c | 1 + |
| arch/arm/mach-shmobile/smp-r8a7791.c | 1 - |
| 3 files changed, 4 insertions(+), 3 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile |
| index 59f63b7b52be..fe3878a1a69a 100644 |
| --- a/arch/arm/mach-shmobile/Makefile |
| +++ b/arch/arm/mach-shmobile/Makefile |
| @@ -37,13 +37,14 @@ endif |
| # CPU reset vector handling objects |
| cpu-y := platsmp.o headsmp.o |
| cpu-$(CONFIG_ARCH_R8A7790) += platsmp-apmu.o |
| +cpu-$(CONFIG_ARCH_R8A7791) += platsmp-apmu.o |
| |
| # SMP objects |
| smp-y := $(cpu-y) |
| smp-$(CONFIG_ARCH_SH73A0) += smp-sh73a0.o headsmp-scu.o platsmp-scu.o |
| smp-$(CONFIG_ARCH_R8A7779) += smp-r8a7779.o headsmp-scu.o platsmp-scu.o |
| smp-$(CONFIG_ARCH_R8A7790) += smp-r8a7790.o |
| -smp-$(CONFIG_ARCH_R8A7791) += smp-r8a7791.o platsmp-apmu.o |
| +smp-$(CONFIG_ARCH_R8A7791) += smp-r8a7791.o |
| smp-$(CONFIG_ARCH_EMEV2) += smp-emev2.o headsmp-scu.o platsmp-scu.o |
| |
| # PM objects |
| @@ -55,7 +56,7 @@ obj-$(CONFIG_ARCH_SH73A0) += pm-sh73a0.o |
| obj-$(CONFIG_ARCH_R8A7740) += pm-r8a7740.o pm-rmobile.o |
| obj-$(CONFIG_ARCH_R8A7779) += pm-r8a7779.o pm-rcar.o |
| obj-$(CONFIG_ARCH_R8A7790) += pm-r8a7790.o pm-rcar.o $(cpu-y) |
| -obj-$(CONFIG_ARCH_R8A7791) += pm-r8a7791.o pm-rcar.o |
| +obj-$(CONFIG_ARCH_R8A7791) += pm-r8a7791.o pm-rcar.o $(cpu-y) |
| |
| # IRQ objects |
| obj-$(CONFIG_ARCH_SH7372) += entry-intc.o |
| diff --git a/arch/arm/mach-shmobile/pm-r8a7791.c b/arch/arm/mach-shmobile/pm-r8a7791.c |
| index c44304c3c6df..25f107bb3657 100644 |
| --- a/arch/arm/mach-shmobile/pm-r8a7791.c |
| +++ b/arch/arm/mach-shmobile/pm-r8a7791.c |
| @@ -69,4 +69,5 @@ void __init r8a7791_pm_init(void) |
| iounmap(p); |
| |
| r8a7791_sysc_init(); |
| + shmobile_smp_apmu_suspend_init(); |
| } |
| diff --git a/arch/arm/mach-shmobile/smp-r8a7791.c b/arch/arm/mach-shmobile/smp-r8a7791.c |
| index df086aa79630..f743386166fb 100644 |
| --- a/arch/arm/mach-shmobile/smp-r8a7791.c |
| +++ b/arch/arm/mach-shmobile/smp-r8a7791.c |
| @@ -30,7 +30,6 @@ static void __init r8a7791_smp_prepare_cpus(unsigned int max_cpus) |
| shmobile_smp_apmu_prepare_cpus(max_cpus); |
| |
| r8a7791_pm_init(); |
| - shmobile_smp_apmu_suspend_init(); |
| } |
| |
| static int r8a7791_smp_boot_secondary(unsigned int cpu, |
| -- |
| 2.1.2 |
| |
