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

Commit 714596b0 authored by Abhimanyu Kapur's avatar Abhimanyu Kapur Committed by Gerrit - the friendly Code Review server
Browse files

msm: board-8916: Add a dedicated DT_MACHINE for terbium 



Add a new DT_MACHINE and smp_ops for msmterbium in board-8916
to share the same binary, which can support dynamic selection
of correct DT_MACHINE at runtime according to device tree.

Change-Id: Id7ad74c68884e54815bd4407e7e616e255badd28
Signed-off-by: default avatarAbhimanyu Kapur <abhimany@codeaurora.org>
parent 70e7f0c6

arch/arm/mach-msm/board-8916.c

+14 −0
Original line number Diff line number Diff line
@@ -95,6 +95,11 @@ static const char *msmtellurium_dt_match[] __initconst = { 
	NULL

};



static const char *msmterbium_dt_match[] __initconst = {

	"qcom,msmterbium",

	NULL

};



DT_MACHINE_START(MSM8916_DT,

		"Qualcomm Technologies, Inc. MSM 8916 (Flattened Device Tree)")

	.map_io = msm8916_map_io,
@@ -130,3 +135,12 @@ DT_MACHINE_START(MSMTellurium_DT, 
	.reserve = msm8916_dt_reserve,

	.smp = &msm8936_smp_ops,

MACHINE_END



DT_MACHINE_START(MSMTerbium_DT,

	"Qualcomm Technologies, Inc. MSM Terbium (Flattened Device Tree)")

	.map_io = msm8916_map_io,

	.init_machine = msm8916_init,

	.dt_compat = msmterbium_dt_match,

	.reserve = msm8916_dt_reserve,

	.smp = &msmterbium_smp_ops,

MACHINE_END

arch/arm/mach-msm/platsmp.c

+11 −0
Original line number Diff line number Diff line
@@ -441,6 +441,17 @@ struct smp_operations msm8916_smp_ops __initdata = { 
#endif

};



struct smp_operations msmterbium_smp_ops __initdata = {

	.smp_init_cpus = arm_smp_init_cpus,

	.smp_prepare_cpus = msm_platform_smp_prepare_cpus_mc,

	.smp_secondary_init = msm_secondary_init,

	.smp_boot_secondary = msm8936_boot_secondary, /*TODO: needs update*/

#ifdef CONFIG_HOTPLUG

	.cpu_die = msm_cpu_die,

	.cpu_kill = msm_cpu_kill,

#endif

};



struct smp_operations msm8936_smp_ops __initdata = {

	.smp_init_cpus = arm_smp_init_cpus,

	.smp_prepare_cpus = msm_platform_smp_prepare_cpus,

arch/arm/mach-msm/platsmp.h

+1 −0
Original line number Diff line number Diff line
@@ -24,3 +24,4 @@ extern struct smp_operations msm8625_smp_ops; 
extern struct smp_operations scorpion_smp_ops;

extern struct smp_operations msm8916_smp_ops;

extern struct smp_operations msm8936_smp_ops;

extern struct smp_operations msmterbium_smp_ops;