Merge "msm: socinfo: Add socinfo for msmtellurium" (098cccab) · Commits · e / devices / android_kernel_sony_msm8994

drivers/soc/qcom/socinfo.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -488,6 +488,10 @@ static struct msm_soc_info cpu_of_id[] = {
		[255] = {FSM_CPU_9010, "FSM9010"},
		[256] = {FSM_CPU_9010, "FSM9010"},
		[257] = {FSM_CPU_9010, "FSM9010"},

		/* Tellurium ID */
		[264] = {MSM_CPU_TELLURIUM, "MSMTELLURIUM"},

		/* Uninitialized IDs are not known to run Linux.
		MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are
		considered as unknown CPU. */
		@@ -998,6 +1002,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_msmtellurium()) {
		dummy_socinfo.id = 264;
		strlcpy(dummy_socinfo.build_id, "msmtellurium - ",
		sizeof(dummy_socinfo.build_id));
		}

		strlcat(dummy_socinfo.build_id, "Dummy socinfo",

+17 −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_msmtellurium() \
		of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmtellurium")
		#else
		#define of_board_is_sim() 0
		#define of_board_is_rumi() 0
		@@ -105,6 +107,7 @@
		#define early_machine_is_mdm9630() 0
		#define early_machine_is_fsm9900() 0
		#define early_machine_is_fsm9010() 0
		#define early_machine_is_msmtellurium() 0
		#endif

		#define PLATFORM_SUBTYPE_MDM 1
		@@ -157,6 +160,7 @@ enum msm_cpu {
		MSM_CPU_8994,
		MSM_CPU_8992,
		FSM_CPU_9010,
		MSM_CPU_TELLURIUM,
		};

		struct msm_soc_info {
		@@ -549,6 +553,19 @@ static inline int cpu_is_msm8939(void)

		}

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

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

		}

		static inline int cpu_is_msm8226(void)
		{
		#ifdef CONFIG_ARCH_MSM8226