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

Commit fa6e9cb2 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Simon Horman
Browse files

ARM: shmobile: apmu: Move cpu_leave_lowpower() to SUSPEND section 



cpu_leave_lowpower() is used for suspend only, not for CPU hotplug.
Hence move it from the HOTPLUG_CPU || SUSPEND section to the SUSPEND
section.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent aa03319f

arch/arm/mach-shmobile/platsmp-apmu.c

+15 −15
Original line number Diff line number Diff line
@@ -270,21 +270,6 @@ static void shmobile_smp_apmu_cpu_shutdown(unsigned int cpu) 
	/* Do ARM specific CPU shutdown */

	cpu_enter_lowpower_a15();

}



static inline void cpu_leave_lowpower(void)

{

	unsigned int v;



	asm volatile("mrc    p15, 0, %0, c1, c0, 0\n"

		     "       orr     %0, %0, %1\n"

		     "       mcr     p15, 0, %0, c1, c0, 0\n"

		     "       mrc     p15, 0, %0, c1, c0, 1\n"

		     "       orr     %0, %0, %2\n"

		     "       mcr     p15, 0, %0, c1, c0, 1\n"

		     : "=&r" (v)

		     : "Ir" (CR_C), "Ir" (0x40)

		     : "cc");

}

#endif



#if defined(CONFIG_HOTPLUG_CPU)
@@ -315,6 +300,21 @@ static int shmobile_smp_apmu_do_suspend(unsigned long cpu) 
	return 1;

}



static inline void cpu_leave_lowpower(void)

{

	unsigned int v;



	asm volatile("mrc    p15, 0, %0, c1, c0, 0\n"

		     "       orr     %0, %0, %1\n"

		     "       mcr     p15, 0, %0, c1, c0, 0\n"

		     "       mrc     p15, 0, %0, c1, c0, 1\n"

		     "       orr     %0, %0, %2\n"

		     "       mcr     p15, 0, %0, c1, c0, 1\n"

		     : "=&r" (v)

		     : "Ir" (CR_C), "Ir" (0x40)

		     : "cc");

}



static int shmobile_smp_apmu_enter_suspend(suspend_state_t state)

{

	cpu_suspend(smp_processor_id(), shmobile_smp_apmu_do_suspend);