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

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

Merge "soc: qcom: Add sa8150 SoC information into socinfo driver"

parents 8a462f2c 709ebf7c

drivers/soc/qcom/socinfo.c

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

	[339] = {MSM_CPU_SM8150, "SM8150"},



	/* sa8150 ID */

	[362] = {MSM_CPU_SA8150, "SA8150"},



	/* sdmshrike ID */

	[340] = {MSM_CPU_SDMSHRIKE, "SDMSHRIKE"},
@@ -1171,6 +1174,10 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 339;

		strlcpy(dummy_socinfo.build_id, "sm8150 - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sa8150()) {

		dummy_socinfo.id = 362;

		strlcpy(dummy_socinfo.build_id, "sa8150 - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sdmshrike()) {

		dummy_socinfo.id = 340;

		strlcpy(dummy_socinfo.build_id, "sdmshrike - ",

include/soc/qcom/socinfo.h

+4 −0
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ 
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8996-cdp")

#define early_machine_is_sm8150()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sm8150")

#define early_machine_is_sa8150()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sa8150")

#define early_machine_is_sdmshrike()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdmshrike")

#define early_machine_is_sm6150()	\
@@ -84,6 +86,7 @@ 
#define early_machine_is_apq8084()	0

#define early_machine_is_msm8996()	0

#define early_machine_is_sm8150()	0

#define early_machine_is_sa8150()	0

#define early_machine_is_sdmshrike()	0

#define early_machine_is_sm6150()	0

#define early_machine_is_qcs405()	0
@@ -108,6 +111,7 @@ enum msm_cpu { 
	MSM_CPU_8084,

	MSM_CPU_8996,

	MSM_CPU_SM8150,

	MSM_CPU_SA8150,

	MSM_CPU_SDMSHRIKE,

	MSM_CPU_SM6150,

	MSM_CPU_QCS405,