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

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

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

parents fa9bfc10 4f9407db

drivers/soc/qcom/socinfo.c

+14 −0
Original line number Diff line number Diff line
@@ -344,6 +344,9 @@ static struct msm_soc_info cpu_of_id[] = { 
	/* sm6150 ID */

	[355] = {MSM_CPU_SM6150, "SM6150"},



	/* sm6150p ID */

	[369] = {MSM_CPU_SM6150P, "SM6150P"},



	/* qcs405 ID */

	[352] = {MSM_CPU_QCS405, "QCS405"},
@@ -360,6 +363,9 @@ static struct msm_soc_info cpu_of_id[] = { 
	/* sdmmagpie ID */

	[365] = {MSM_CPU_SDMMAGPIE, "SDMMAGPIE"},



	/* sdmmagpiep ID */

	[366] = {MSM_CPU_SDMMAGPIEP, "SDMMAGPIEP"},



	/* sa6155P ID */

	[377] = {MSM_CPU_SA6155P, "SA6155P"},
@@ -1256,6 +1262,10 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 355;

		strlcpy(dummy_socinfo.build_id, "sm6150 - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sm6150p()) {

		dummy_socinfo.id = 369;

		strlcpy(dummy_socinfo.build_id, "sm6150p - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_qcs405()) {

		dummy_socinfo.id = 352;

		strlcpy(dummy_socinfo.build_id, "qcs405 - ",
@@ -1276,6 +1286,10 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 365;

		strlcpy(dummy_socinfo.build_id, "sdmmagpie - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sdmmagpiep()) {

		dummy_socinfo.id = 366;

		strlcpy(dummy_socinfo.build_id, "sdmmagpiep - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sa6155p()) {

		dummy_socinfo.id = 377;

		strlcpy(dummy_socinfo.build_id, "sa6155p - ",

include/soc/qcom/socinfo.h

+8 −0
Original line number Diff line number Diff line
@@ -69,6 +69,8 @@ 
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdmshrike")

#define early_machine_is_sm6150()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sm6150")

#define early_machine_is_sm6150p()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sm6150p")

#define early_machine_is_qcs405()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,qcs405")

#define early_machine_is_qcs403()	\
@@ -79,6 +81,8 @@ 
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdxprairie")

#define early_machine_is_sdmmagpie()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdmmagpie")

#define early_machine_is_sdmmagpiep()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdmmagpiep")

#define early_machine_is_sa6155p()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sa6155p")

#define early_machine_is_sa4155p()	\
@@ -111,11 +115,13 @@ 
#define early_machine_is_sa8155p()	0

#define early_machine_is_sdmshrike()	0

#define early_machine_is_sm6150()	0

#define early_machine_is_sm6150p()	0

#define early_machine_is_qcs405()	0

#define early_machine_is_qcs403()	0

#define early_machine_is_qcs401()	0

#define early_machine_is_sdxprairie()	0

#define early_machine_is_sdmmagpie()	0

#define early_machine_is_sdmmagpiep()	0

#define early_machine_is_sa6155p()	0

#define early_machine_is_sa4155p()	0

#define early_machine_is_sa6155()	0
@@ -146,11 +152,13 @@ enum msm_cpu { 
	MSM_CPU_SA8155P,

	MSM_CPU_SDMSHRIKE,

	MSM_CPU_SM6150,

	MSM_CPU_SM6150P,

	MSM_CPU_QCS405,

	MSM_CPU_QCS403,

	MSM_CPU_QCS401,

	SDX_CPU_SDXPRAIRIE,

	MSM_CPU_SDMMAGPIE,

	MSM_CPU_SDMMAGPIEP,

	MSM_CPU_SA6155P,

	MSM_CPU_SA4155P,

	MSM_CPU_SA6155,