Merge "ARM: dts: msm: Revert msmnickel changes" (e455ae50) · Commits · e / devices / android_kernel_sony_msm8994

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

+0 −14

Original line number	Diff line number	Diff line
		@@ -100,11 +100,6 @@ static const char *msmterbium_dt_match[] __initconst = {
		NULL
		};

		static const char *msmnickel_dt_match[] __initconst = {
		"qcom,msmnickel",
		NULL
		};

		DT_MACHINE_START(MSM8916_DT,
		"Qualcomm Technologies, Inc. MSM 8916 (Flattened Device Tree)")
		.map_io = msm8916_map_io,
		@@ -149,12 +144,3 @@ DT_MACHINE_START(MSMTerbium_DT,
		.reserve = msm8916_dt_reserve,
		.smp = &msmterbium_smp_ops,
		MACHINE_END

		DT_MACHINE_START(MSMNickel_DT,
		"Qualcomm Technologies, Inc. MSM Nickel (Flattened Device Tree)")
		.map_io = msm8916_map_io,
		.init_machine = msm8916_init,
		.dt_compat = msmnickel_dt_match,
		.reserve = msm8916_dt_reserve,
		.smp = &msm8936_smp_ops,
		MACHINE_END

+0 −10

Original line number	Diff line number	Diff line
		@@ -506,12 +506,6 @@ static struct msm_soc_info cpu_of_id[] = {
		/* Terbium ID */
		[266] = {MSM_CPU_TERBIUM, "MSMTERBIUM"},

		/* Nickel ID */
		[268] = {MSM_CPU_NICKEL, "MSMNICKEL"},
		[269] = {MSM_CPU_NICKEL, "MSMNICKEL"},
		[270] = {MSM_CPU_NICKEL, "MSMNICKEL"},
		[271] = {MSM_CPU_NICKEL, "APQNICKEL"},

		/* Uninitialized IDs are not known to run Linux.
		MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are
		considered as unknown CPU. */
		@@ -1030,10 +1024,6 @@ static void * __init setup_dummy_socinfo(void)
		dummy_socinfo.id = 264;
		strlcpy(dummy_socinfo.build_id, "msmtellurium - ",
		sizeof(dummy_socinfo.build_id));
		} else if (early_machine_is_msmnickel()) {
		dummy_socinfo.id = 268;
		strlcpy(dummy_socinfo.build_id, "msmnickel - ",
		sizeof(dummy_socinfo.build_id));
		}

		strlcat(dummy_socinfo.build_id, "Dummy socinfo",

+1 −17

Original line number	Diff line number	Diff line
		@@ -80,8 +80,6 @@
		of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmterbium")
		#define early_machine_is_msmtellurium() \
		of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmtellurium")
		#define early_machine_is_msmnickel() \
		of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmnickel")
		#else
		#define of_board_is_sim() 0
		#define of_board_is_rumi() 0
		@@ -113,7 +111,6 @@
		#define early_machine_is_fsm9010() 0
		#define early_machine_is_msmtellurium() 0
		#define early_machine_is_msmterbium() 0
		#define early_machine_is_msmnickel() 0
		#endif

		#define PLATFORM_SUBTYPE_MDM 1
		@@ -168,7 +165,6 @@ enum msm_cpu {
		FSM_CPU_9010,
		MSM_CPU_TELLURIUM,
		MSM_CPU_TERBIUM,
		MSM_CPU_NICKEL,
		};

		struct msm_soc_info {
		@@ -574,18 +570,6 @@ static inline int cpu_is_msmtellurium(void)

		}

		static inline int cpu_is_msmnickel(void)
		{
		#ifdef CONFIG_ARCH_MSM8916
		enum msm_cpu cpu = socinfo_get_msm_cpu();

		BUG_ON(cpu == MSM_CPU_UNKNOWN);
		return cpu == MSM_CPU_NICKEL;
		#else
		return 0;
		#endif
		}

		static inline int cpu_is_msm8226(void)
		{
		#ifdef CONFIG_ARCH_MSM8226