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

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

Merge "soc: qcom: Add support for sa8150p into socinfo driver"

parents 09c86afc 76b467c5

drivers/soc/qcom/socinfo.c

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

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



	/* sa8150P ID */

	[367] = {MSM_CPU_SA8150P, "SA8150P"},



	/* sdmshrike ID */

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

		strlcpy(dummy_socinfo.build_id, "sa8150 - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sa8150p()) {

		dummy_socinfo.id = 367;

		strlcpy(dummy_socinfo.build_id, "sa8150p - ",

		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
@@ -61,6 +61,8 @@ 
	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_sa8150p()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sa8150p")

#define early_machine_is_sdmshrike()	\

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

#define early_machine_is_sm6150()	\
@@ -91,6 +93,7 @@ 
#define early_machine_is_msm8996()	0

#define early_machine_is_sm8150()	0

#define early_machine_is_sa8150()	0

#define early_machine_is_sa8150p()	0

#define early_machine_is_sdmshrike()	0

#define early_machine_is_sm6150()	0

#define early_machine_is_qcs405()	0
@@ -118,6 +121,7 @@ enum msm_cpu { 
	MSM_CPU_8996,

	MSM_CPU_SM8150,

	MSM_CPU_SA8150,

	MSM_CPU_SA8150P,

	MSM_CPU_SDMSHRIKE,

	MSM_CPU_SM6150,

	MSM_CPU_QCS405,