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

Commit c704ca04 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 sxr1120"

parents e4b7e53a 9575aef2

drivers/soc/qcom/socinfo.c

+7 −0
Original line number Diff line number Diff line
@@ -602,6 +602,9 @@ static struct msm_soc_info cpu_of_id[] = { 
	/* SDM710 ID */

	[360] = {MSM_CPU_SDM710, "SDM710"},



	/* SXR1120 ID */

	[370] = {MSM_CPU_SXR1120, "SXR1120"},



	/* 8953 ID */

	[293] = {MSM_CPU_8953, "MSM8953"},

	[304] = {MSM_CPU_8953, "APQ8053"},
@@ -1551,6 +1554,10 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 347;

		strlcpy(dummy_socinfo.build_id, "qcs605 - ",

			sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sxr1120()) {

		dummy_socinfo.id = 370;

		strlcpy(dummy_socinfo.build_id, "sxr1120 - ",

			sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_mdm9650()) {

		dummy_socinfo.id = 286;

		strlcpy(dummy_socinfo.build_id, "mdm9650 - ",

include/soc/qcom/socinfo.h

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

#define early_machine_is_sdm710()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdm670")

#define early_machine_is_sxr1120()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sxr1120")

#define early_machine_is_msm8953()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8953")

#define early_machine_is_msm8937()	\
@@ -175,6 +177,7 @@ 
#define early_machine_is_qcs605()	0

#define early_machine_is_sda670()	0

#define early_machine_is_sdm710()	0

#define early_machine_is_sxr1120()	0

#define early_machine_is_msm8953()	0

#define early_machine_is_msm8937()	0

#define early_machine_is_sdm450()	0
@@ -250,6 +253,7 @@ enum msm_cpu { 
	MSM_CPU_QCS605,

	MSM_CPU_SDA670,

	MSM_CPU_SDM710,

	MSM_CPU_SXR1120,

	MSM_CPU_8953,

	MSM_CPU_SDM450,

	MSM_CPU_SDM632,