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

Commit caf86a73 authored by Soren Brinkmann's avatar Soren Brinkmann Committed by Michal Simek
Browse files

ARM: zynq: Remove hotplug.c 



The hotplug code contains only a single function, which is an SMP
function. Move that to platsmp.c where all other SMP runctions reside.
That allows removing hotplug.c and declaring the cpu_die function
static.

Signed-off-by: default avatarSoren Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
parent 50c7960a

arch/arm/mach-zynq/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -6,5 +6,4 @@ 
obj-y				:= common.o slcr.o pm.o

CFLAGS_REMOVE_hotplug.o		=-march=armv6k

CFLAGS_hotplug.o 		=-Wa,-march=armv7-a -mcpu=cortex-a9

obj-$(CONFIG_HOTPLUG_CPU)	+= hotplug.o

obj-$(CONFIG_SMP)		+= headsmp.o platsmp.o

arch/arm/mach-zynq/common.h

+0 −3
Original line number Diff line number Diff line
@@ -39,9 +39,6 @@ extern struct smp_operations zynq_smp_ops __initdata; 


extern void __iomem *zynq_scu_base;



/* Hotplug */

extern void zynq_platform_cpu_die(unsigned int cpu);



void zynq_pm_late_init(void);



static inline void zynq_core_pm_init(void)

arch/arm/mach-zynq/hotplug.c

+0 −17
Original line number Diff line number Diff line
@@ -12,20 +12,3 @@ 
 */

#include <asm/proc-fns.h>

/*

 * platform-specific code to shutdown a CPU

 *

 * Called with IRQs disabled

 */

void zynq_platform_cpu_die(unsigned int cpu)

{

	zynq_slcr_cpu_state_write(cpu, true);



	/*

	 * there is no power-control hardware on this platform, so all

	 * we can do is put the core into WFI; this is safe as the calling

	 * code will have already disabled interrupts

	 */

	for (;;)

		cpu_do_idle();

}

arch/arm/mach-zynq/platsmp.c

+18 −0
Original line number Diff line number Diff line
@@ -136,6 +136,24 @@ static int zynq_cpu_kill(unsigned cpu) 
	zynq_slcr_cpu_stop(cpu);

	return 1;

}



/*

 * platform-specific code to shutdown a CPU

 *

 * Called with IRQs disabled

 */

static void zynq_platform_cpu_die(unsigned int cpu)

{

	zynq_slcr_cpu_state_write(cpu, true);



	/*

	 * there is no power-control hardware on this platform, so all

	 * we can do is put the core into WFI; this is safe as the calling

	 * code will have already disabled interrupts

	 */

	for (;;)

		cpu_do_idle();

}

#endif



struct smp_operations zynq_smp_ops __initdata = {