Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfe4cfa8 authored by Magnus Damm's avatar Magnus Damm Committed by Simon Horman
Browse files

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: default avatarMagnus Damm <damm+renesas@opensource.se>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 8e26118d

arch/arm/mach-shmobile/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -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
@@ -54,7 +55,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

arch/arm/mach-shmobile/pm-r8a7791.c

+1 −0
Original line number Diff line number Diff line
@@ -69,4 +69,5 @@ void __init r8a7791_pm_init(void) 
	iounmap(p);



	r8a7791_sysc_init();

	shmobile_smp_apmu_suspend_init();

}

arch/arm/mach-shmobile/smp-r8a7791.c

+0 −1
Original line number Diff line number Diff line
@@ -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,