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

Commit 03eea7cd authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v3.17-rockchip-smp-hotplug' of... 

Merge tag 'v3.17-rockchip-smp-hotplug' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/soc

Merge "CPU-Hotplug support for RK3066 and RK3188" from Heiko Stuebner:

* tag 'v3.17-rockchip-smp-hotplug' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip

:
  ARM: rockchip: Add cpu hotplug support for RK3XXX SoCs
  ARM: rockchip: select ARMv7 compiler flags for platsmp.o

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 71b4807a f54b91fd

arch/arm/mach-rockchip/Makefile

+2 −0
Original line number Diff line number Diff line 
CFLAGS_platsmp.o := -march=armv7-a



obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip.o

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

arch/arm/mach-rockchip/platsmp.c

+20 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/of_address.h>



#include <asm/cacheflush.h>

#include <asm/cp15.h>

#include <asm/smp_scu.h>

#include <asm/smp_plat.h>

#include <asm/mach/map.h>
@@ -178,8 +179,27 @@ static void __init rockchip_smp_prepare_cpus(unsigned int max_cpus) 
		pmu_set_power_domain(0 + i, false);

}



#ifdef CONFIG_HOTPLUG_CPU

static int rockchip_cpu_kill(unsigned int cpu)

{

	pmu_set_power_domain(0 + cpu, false);

	return 1;

}



static void rockchip_cpu_die(unsigned int cpu)

{

	v7_exit_coherency_flush(louis);

	while(1)

		cpu_do_idle();

}

#endif



static struct smp_operations rockchip_smp_ops __initdata = {

	.smp_prepare_cpus	= rockchip_smp_prepare_cpus,

	.smp_boot_secondary	= rockchip_boot_secondary,

#ifdef CONFIG_HOTPLUG_CPU

	.cpu_kill		= rockchip_cpu_kill,

	.cpu_die		= rockchip_cpu_die,

#endif

};

CPU_METHOD_OF_DECLARE(rk3066_smp, "rockchip,rk3066-smp", &rockchip_smp_ops);