Merge "msm: socinfo: Add socinfo for msmterbium" (31d4b086) · Commits · e / devices / android_kernel_sony_msm8994

drivers/soc/qcom/socinfo.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -503,6 +503,9 @@ static struct msm_soc_info cpu_of_id[] = {
		/* Tellurium ID */
		[264] = {MSM_CPU_TELLURIUM, "MSMTELLURIUM"},

		/* Terbium ID */
		[266] = {MSM_CPU_TERBIUM, "MSMTERBIUM"},

		/* Uninitialized IDs are not known to run Linux.
		MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are
		considered as unknown CPU. */
		@@ -1013,6 +1016,10 @@ static void * __init setup_dummy_socinfo(void)
		dummy_socinfo.id = 251;
		strlcpy(dummy_socinfo.build_id, "msm8992 - ",
		sizeof(dummy_socinfo.build_id));
		} else if (early_machine_is_msmterbium()) {
		dummy_socinfo.id = 266;
		strlcpy(dummy_socinfo.build_id, "msmterbium - ",
		sizeof(dummy_socinfo.build_id));
		} else if (early_machine_is_msmtellurium()) {
		dummy_socinfo.id = 264;
		strlcpy(dummy_socinfo.build_id, "msmtellurium - ",

+4 −0

Original line number	Diff line number	Diff line
		@@ -76,6 +76,8 @@
		of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8992")
		#define early_machine_is_fsm9010() \
		of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,fsm9010")
		#define early_machine_is_msmterbium() \
		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")
		#else
		@@ -108,6 +110,7 @@
		#define early_machine_is_fsm9900() 0
		#define early_machine_is_fsm9010() 0
		#define early_machine_is_msmtellurium() 0
		#define early_machine_is_msmterbium() 0
		#endif

		#define PLATFORM_SUBTYPE_MDM 1
		@@ -161,6 +164,7 @@ enum msm_cpu {
		MSM_CPU_8992,
		FSM_CPU_9010,
		MSM_CPU_TELLURIUM,
		MSM_CPU_TERBIUM,
		};

		struct msm_soc_info {