Merge "msm: board-8916: Add a dedicated DT_MACHINE for terbium" (5e373389) · Commits · e / devices / android_kernel_sony_msm8994

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

+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,

+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;