Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78d8812f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: socinfo: add socinfo for msmzirc"

parents dd2abf5a dbbe9b0a

drivers/soc/qcom/socinfo.c

+11 −0
Original line number Diff line number Diff line
@@ -446,6 +446,13 @@ static enum msm_cpu cpu_of_id[] = { 
	/* 8936 IDs */

	[233] = MSM_CPU_8936,



	/* ZIRC IDs */

	[234] = MSM_CPU_ZIRC,

	[235] = MSM_CPU_ZIRC,

	[236] = MSM_CPU_ZIRC,

	[237] = MSM_CPU_ZIRC,

	[238] = MSM_CPU_ZIRC,



	/* Uninitialized IDs are not known to run Linux.

	   MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are

	   considered as unknown CPU. */
@@ -900,6 +907,10 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 233;

		strlcpy(dummy_socinfo.build_id, "msm8936 - ",

			sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_msmzirc()) {

		dummy_socinfo.id = 238;

		strlcpy(dummy_socinfo.build_id, "msmzirc - ",

			sizeof(dummy_socinfo.build_id));

	}



	strlcat(dummy_socinfo.build_id, "Dummy socinfo",

include/soc/qcom/socinfo.h

+3 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ 
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,apq8084")

#define early_machine_is_mdm9630()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,mdm9630")

#define early_machine_is_msmzirc()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmzirc")

#define early_machine_is_fsm9900()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,fsm9900")

#define early_machine_is_msmsamarium()	\
@@ -144,6 +146,7 @@ enum msm_cpu { 
	MSM_CPU_9630,

	FSM_CPU_9900,

	MSM_CPU_SAMARIUM,

	MSM_CPU_ZIRC,

};



enum pmic_model {