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

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

Merge "soc: qcom: socinfo: Add soc information for scuba"

parents 48d09ea3 0e129664

drivers/soc/qcom/socinfo.c

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

	[434] = {MSM_CPU_LAGOON, "LAGOON"},



	/* Scuba ID */

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



	/* Uninitialized IDs are not known to run Linux.

	 * MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are

	 * considered as unknown CPU.
@@ -1203,6 +1206,10 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 434;

		strlcpy(dummy_socinfo.build_id, "lagoon - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_scuba()) {

		dummy_socinfo.id = 441;

		strlcpy(dummy_socinfo.build_id, "scuba - ",

		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
@@ -60,6 +60,8 @@ 
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,bengal")

#define early_machine_is_lagoon()	\

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

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

#define early_machine_is_sm6150()	\
@@ -94,6 +96,7 @@ 
#define early_machine_is_lito()		0

#define early_machine_is_bengal()	0

#define early_machine_is_lagoon()	0

#define early_machine_is_scuba()	0

#define early_machine_is_sdmshrike()	0

#define early_machine_is_sm6150()	0

#define early_machine_is_qcs405()	0
@@ -125,6 +128,7 @@ enum msm_cpu { 
	MSM_CPU_LITO,

	MSM_CPU_BENGAL,

	MSM_CPU_LAGOON,

	MSM_CPU_SCUBA,

	MSM_CPU_SDMSHRIKE,

	MSM_CPU_SM6150,

	MSM_CPU_QCS405,