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

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

Merge "soc: qcom: socinfo: Add support for SM8150P HDK soc-id"

parents 2e715713 efd592ec

Documentation/devicetree/bindings/arm/msm/msm.txt

+3 −0
Original line number Diff line number Diff line
@@ -44,6 +44,9 @@ SoCs: 
- SM8150

  compatible = "qcom,sm8150"



- SM8150P

  compatible = "qcom,sm8150p"



- SDMSHRIKE

  compatible = "qcom,sdmshrike"

drivers/soc/qcom/socinfo.c

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

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



	/* sm8150p ID */

	[361] = {MSM_CPU_SM8150, "SM8150P"},



	/* sa8155 ID */

	[362] = {MSM_CPU_SA8155, "SA8155"},
@@ -1223,6 +1226,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_sm8150p()) {

		dummy_socinfo.id = 361;

		strlcpy(dummy_socinfo.build_id, "sm8150p - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sa8155()) {

		dummy_socinfo.id = 362;

		strlcpy(dummy_socinfo.build_id, "sa8155 - ",

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_sm8150p()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sm8150p")

#define early_machine_is_sa8155()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sa8155")

#define early_machine_is_sa8155p()	\
@@ -98,6 +100,7 @@ 
#define early_machine_is_apq8084()	0

#define early_machine_is_msm8996()	0

#define early_machine_is_sm8150()	0

#define early_machine_is_sm8150p()	0

#define early_machine_is_sa8155()	0

#define early_machine_is_sa8155p()	0

#define early_machine_is_sdmshrike()	0
@@ -129,6 +132,7 @@ enum msm_cpu { 
	MSM_CPU_8084,

	MSM_CPU_8996,

	MSM_CPU_SM8150,

	MSM_CPU_SM8150P,

	MSM_CPU_SA8155,

	MSM_CPU_SA8155P,

	MSM_CPU_SDMSHRIKE,