Merge "soc: qcom: socinfo: add dummy socinfo for the MSMPLUTONIUM" (2d1aaf10) · Commits · e / devices / android_kernel_sony_msm8994

drivers/soc/qcom/socinfo.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -453,6 +453,9 @@ static enum msm_cpu cpu_of_id[] = {
		[237] = MSM_CPU_ZIRC,
		[238] = MSM_CPU_ZIRC,

		/* PLUTONIUM ID */
		[207] = MSM_CPU_PLUTONIUM,

		/* Uninitialized IDs are not known to run Linux.
		MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are
		considered as unknown CPU. */
		@@ -911,6 +914,10 @@ static void * __init setup_dummy_socinfo(void)
		dummy_socinfo.id = 238;
		strlcpy(dummy_socinfo.build_id, "msmzirc - ",
		sizeof(dummy_socinfo.build_id));
		} else if (early_machine_is_msmplutonium()) {
		dummy_socinfo.id = 207;
		strlcpy(dummy_socinfo.build_id, "msmplutonium - ",
		sizeof(dummy_socinfo.build_id));
		}

		strlcat(dummy_socinfo.build_id, "Dummy socinfo",

+3 −0

Original line number	Diff line number	Diff line
		@@ -70,6 +70,8 @@
		of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,fsm9900")
		#define early_machine_is_msmsamarium() \
		of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmsamarium")
		#define early_machine_is_msmplutonium() \
		of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmplutonium")
		#else
		#define of_board_is_sim() 0
		#define of_board_is_rumi() 0
		@@ -147,6 +149,7 @@ enum msm_cpu {
		FSM_CPU_9900,
		MSM_CPU_SAMARIUM,
		MSM_CPU_ZIRC,
		MSM_CPU_PLUTONIUM,
		};

		enum pmic_model {