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

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

Merge "soc: qcom: socinfo: Add support for Scuba iot soc-id"

parents a9da3798 1484d9f2

drivers/soc/qcom/socinfo.c

+12 −0
Original line number Diff line number Diff line
@@ -345,6 +345,10 @@ static struct msm_soc_info cpu_of_id[] = { 
	[441] = {MSM_CPU_SCUBA, "SCUBA"},

	[471] = {MSM_CPU_SCUBA, "SCUBA"},



	/* Scuba IIOT  ID */

	[473] = {MSM_CPU_SCUBAIOT, "SCUBAIIOT"},

	[474] = {MSM_CPU_SCUBAPIOT, "SCUBAPIIOT"},



	/* BENGAL-IOT ID */

	[469] = {MSM_CPU_BENGAL_IOT, "BENGAL-IOT"},
@@ -1242,6 +1246,14 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 441;

		strlcpy(dummy_socinfo.build_id, "scuba - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_scubaiot()) {

		dummy_socinfo.id = 473;

		strlcpy(dummy_socinfo.build_id, "scubaiot - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_scubapiot()) {

		dummy_socinfo.id = 474;

		strlcpy(dummy_socinfo.build_id, "scubapiot - ",

		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

+8 −0
Original line number Diff line number Diff line
@@ -66,6 +66,10 @@ 
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,lagoon")

#define early_machine_is_scuba()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,scuba")

#define early_machine_is_scubaiot()        \

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,scuba-iot")

#define early_machine_is_scubapiot()        \

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,scubap-iot")

#define early_machine_is_sdmshrike()	\

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

#define early_machine_is_sm6150()	\
@@ -109,6 +113,8 @@ 
#define early_machine_is_bengalp()	0

#define early_machine_is_lagoon()	0

#define early_machine_is_scuba()	0

#define early_machine_is_scubaiot()	0

#define early_machine_is_scubapiot()	0

#define early_machine_is_sdmshrike()	0

#define early_machine_is_sm6150()	0

#define early_machine_is_qcs405()	0
@@ -147,6 +153,8 @@ enum msm_cpu { 
	MSM_CPU_BENGALP,

	MSM_CPU_LAGOON,

	MSM_CPU_SCUBA,

	MSM_CPU_SCUBAIOT,

	MSM_CPU_SCUBAPIOT,

	MSM_CPU_SDMSHRIKE,

	MSM_CPU_SM6150,

	MSM_CPU_QCS405,