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

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

Merge "soc: qcom: socinfo: add support for sdm429 and sdm439"

parents 4f4c93fd 6c7a3bd4

drivers/soc/qcom/socinfo.c

+12 −0
Original line number Diff line number Diff line
@@ -595,6 +595,10 @@ static struct msm_soc_info cpu_of_id[] = { 
	[294] = {MSM_CPU_8937, "MSM8937"},

	[295] = {MSM_CPU_8937, "APQ8937"},



	/* SDM429 and SDM439 ID*/

	[353] = {MSM_CPU_SDM439, "SDM439"},

	[354] = {MSM_CPU_SDM429, "SDM429"},





	/* Uninitialized IDs are not known to run Linux.

	 * MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are
@@ -1535,6 +1539,14 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 349;

		strlcpy(dummy_socinfo.build_id, "sdm632 - ",

			sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sdm439()) {

		dummy_socinfo.id = 353;

		strlcpy(dummy_socinfo.build_id, "sdm439 - ",

				sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sdm429()) {

		dummy_socinfo.id = 354;

		strlcpy(dummy_socinfo.build_id, "sdm429 - ",

				sizeof(dummy_socinfo.build_id));

	}



	strlcat(dummy_socinfo.build_id, "Dummy socinfo",

include/soc/qcom/socinfo.h

+9 −1
Original line number Diff line number Diff line
@@ -114,6 +114,10 @@ 
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdm450")

#define early_machine_is_sdm632()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdm632")

#define early_machine_is_sdm439()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdm439")

#define early_machine_is_sdm429()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdm429")

#else

#define of_board_is_sim()		0

#define of_board_is_rumi()		0
@@ -160,6 +164,8 @@ 
#define early_machine_is_msm8937()	0

#define early_machine_is_sdm450()	0

#define early_machine_is_sdm632()	0

#define early_machine_is_sdm439()	0

#define early_machine_is_sdm429()	0

#endif



#define PLATFORM_SUBTYPE_MDM	1
@@ -228,7 +234,9 @@ enum msm_cpu { 
	MSM_CPU_SDM450,

	MSM_CPU_SDM632,

	MSM_CPU_SDA632,

	MSM_CPU_8937

	MSM_CPU_8937,

	MSM_CPU_SDM439,

	MSM_CPU_SDM429,

};



struct msm_soc_info {