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

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

ARM: shmobile: sh73a0: Rely on DT for SMP CPU info 



Remove sh73a0 specific ->smp_init_cpus() callback and
instead of relying on shmobile_smp_init_cpus() simply
use DT for CPU core information.

This assumes that DT_MACHINE_START is used which is
the case when AG5EVM and Kota2 are removed.

Signed-off-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent cfa66a81

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

+2 −9
Original line number Diff line number Diff line
@@ -62,6 +62,8 @@ static int __cpuinit sh73a0_boot_secondary(unsigned int cpu, struct task_struct 


static void __init sh73a0_smp_prepare_cpus(unsigned int max_cpus)

{

	/* setup sh73a0 specific SCU base */

	shmobile_scu_base = IOMEM(SH73A0_SCU_BASE);

	scu_enable(shmobile_scu_base);



	/* Map the reset vector (in headsmp-scu.S, headsmp.S) */
@@ -74,14 +76,6 @@ static void __init sh73a0_smp_prepare_cpus(unsigned int max_cpus) 
	scu_power_mode(shmobile_scu_base, SCU_PM_NORMAL);

}



static void __init sh73a0_smp_init_cpus(void)

{

	/* setup sh73a0 specific SCU base */

	shmobile_scu_base = IOMEM(SH73A0_SCU_BASE);



	shmobile_smp_init_cpus(scu_get_core_count(shmobile_scu_base));

}



#ifdef CONFIG_HOTPLUG_CPU

static int sh73a0_cpu_kill(unsigned int cpu)

{
@@ -120,7 +114,6 @@ static int sh73a0_cpu_disable(unsigned int cpu) 
#endif /* CONFIG_HOTPLUG_CPU */



struct smp_operations sh73a0_smp_ops __initdata = {

	.smp_init_cpus		= sh73a0_smp_init_cpus,

	.smp_prepare_cpus	= sh73a0_smp_prepare_cpus,

	.smp_boot_secondary	= sh73a0_boot_secondary,

#ifdef CONFIG_HOTPLUG_CPU