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

Commit 926e92fe 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 SDM632 soc-id"

parents d03969c9 06dc21e7

drivers/soc/qcom/socinfo.c

+8 −0
Original line number Diff line number Diff line
@@ -587,6 +587,10 @@ static struct msm_soc_info cpu_of_id[] = { 
	/* SDM450 ID */

	[338] = {MSM_CPU_SDM450, "SDM450"},



	/* SDM632 ID */

	[349] = {MSM_CPU_SDM632, "SDM632"},

	[350] = {MSM_CPU_SDA632, "SDA632"},



	/* Uninitialized IDs are not known to run Linux.

	 * MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are

	 * considered as unknown CPU.
@@ -1469,6 +1473,10 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 338;

		strlcpy(dummy_socinfo.build_id, "sdm450 - ",

			sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sdm632()) {

		dummy_socinfo.id = 349;

		strlcpy(dummy_socinfo.build_id, "sdm632 - ",

			sizeof(dummy_socinfo.build_id));

	}



	strlcat(dummy_socinfo.build_id, "Dummy socinfo",

include/soc/qcom/socinfo.h

+5 −0
Original line number Diff line number Diff line
@@ -110,6 +110,8 @@ 
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8953")

#define early_machine_is_sdm450()	\

	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")

#else

#define of_board_is_sim()		0

#define of_board_is_rumi()		0
@@ -154,6 +156,7 @@ 
#define early_machine_is_sda670()	0

#define early_machine_is_msm8953()	0

#define early_machine_is_sdm450()	0

#define early_machine_is_sdm632()	0

#endif



#define PLATFORM_SUBTYPE_MDM	1
@@ -220,6 +223,8 @@ enum msm_cpu { 
	MSM_CPU_SDA670,

	MSM_CPU_8953,

	MSM_CPU_SDM450,

	MSM_CPU_SDM632,

	MSM_CPU_SDA632,

};



struct msm_soc_info {