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

Commit de6576cd authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: socinfo: Add support for QCM4290/QCS4290 soc-id"

parents 26fe5533 4e57f9a0

drivers/soc/qcom/socinfo.c

+14 −0
Original line number Diff line number Diff line
@@ -342,6 +342,12 @@ static struct msm_soc_info cpu_of_id[] = { 
	[441] = {MSM_CPU_SCUBA, "SCUBA"},

	[471] = {MSM_CPU_SCUBA, "SCUBA"},



	/* QCM4290 ID */

	[469] = {MSM_CPU_QCM4290, "QCM4290"},



	/* QCS4290 ID */

	[470] = {MSM_CPU_QCS4290, "QCS4290"},



	/* Uninitialized IDs are not known to run Linux.

	 * MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are

	 * considered as unknown CPU.
@@ -1249,6 +1255,14 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 365;

		strlcpy(dummy_socinfo.build_id, "sdmmagpie - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_qcm4290()) {

		dummy_socinfo.id = 469;

		strlcpy(dummy_socinfo.build_id, "qcm4290 - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_qcs4290()) {

		dummy_socinfo.id = 470;

		strlcpy(dummy_socinfo.build_id, "qcs4290 - ",

		sizeof(dummy_socinfo.build_id));

	} else

		strlcat(dummy_socinfo.build_id, "Dummy socinfo",

			sizeof(dummy_socinfo.build_id));

include/soc/qcom/socinfo.h

+8 −0
Original line number Diff line number Diff line
@@ -76,6 +76,10 @@ 
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdmmagpie")

#define early_machine_is_sdm660()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdm660")

#define early_machine_is_qcm4290()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,qcm4290")

#define early_machine_is_qcs4290()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,qcs4290")

#else

#define of_board_is_sim()		0

#define of_board_is_rumi()		0
@@ -108,6 +112,8 @@ 
#define early_machine_is_sdxprairie()	0

#define early_machine_is_sdmmagpie()	0

#define early_machine_is_sdm660()	0

#define early_machine_is_qcm4290()	0

#define early_machine_is_qcs4290()	0

#endif



#define PLATFORM_SUBTYPE_MDM	1
@@ -142,6 +148,8 @@ enum msm_cpu { 
	MSM_CPU_QCS405,

	SDX_CPU_SDXPRAIRIE,

	MSM_CPU_SDMMAGPIE,

	MSM_CPU_QCM4290,

	MSM_CPU_QCS4290,

};



struct msm_soc_info {