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

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

Merge "soc: qcom: socinfo: Add soc information for KhajeP and KhajeQ"

parents 7ef8b02e 7bdf47f5

drivers/soc/qcom/socinfo.c

+14 −0
Original line number Original line Diff line number Diff line
@@ -338,6 +338,12 @@ static struct msm_soc_info cpu_of_id[] = { 
	/* Khaje ID */

	/* Khaje ID */

	[518] = {MSM_CPU_KHAJE, "KHAJE"},

	[518] = {MSM_CPU_KHAJE, "KHAJE"},





	/* Khajep ID */

	[561] = {MSM_CPU_KHAJEP, "KHAJEP"},



	/* Khajeq ID */

	[562] = {MSM_CPU_KHAJEQ, "KHAJEQ"},



	/* Lagoon ID */

	/* Lagoon ID */

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

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

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

	[459] = {MSM_CPU_LAGOON, "LAGOON"},
@@ -1268,6 +1274,14 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 518;

		dummy_socinfo.id = 518;

		strlcpy(dummy_socinfo.build_id, "khaje - ",

		strlcpy(dummy_socinfo.build_id, "khaje - ",

		sizeof(dummy_socinfo.build_id));

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_khajep()) {

		dummy_socinfo.id = 561;

		strlcpy(dummy_socinfo.build_id, "khajep - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_khajeq()) {

		dummy_socinfo.id = 562;

		strlcpy(dummy_socinfo.build_id, "khajeq - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_bengalp()) {

	} else if (early_machine_is_bengalp()) {

		dummy_socinfo.id = 445;

		dummy_socinfo.id = 445;

		strlcpy(dummy_socinfo.build_id, "bengalp - ",

		strlcpy(dummy_socinfo.build_id, "bengalp - ",

include/soc/qcom/socinfo.h

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

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,bengalp")

#define early_machine_is_khaje()	\

#define early_machine_is_khaje()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,khaje")

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,khaje")

#define early_machine_is_khajep()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,khajep")

#define early_machine_is_khajeq()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,khajeq")

#define early_machine_is_lagoon()	\

#define early_machine_is_lagoon()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,lagoon")

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,lagoon")

#define early_machine_is_scuba()	\

#define early_machine_is_scuba()	\
@@ -128,6 +132,8 @@ 
#define early_machine_is_bengal()	0

#define early_machine_is_bengal()	0

#define early_machine_is_bengalp()	0

#define early_machine_is_bengalp()	0

#define early_machine_is_khaje()	0

#define early_machine_is_khaje()	0

#define early_machine_is_khajep()	0

#define early_machine_is_khajeq()	0

#define early_machine_is_lagoon()	0

#define early_machine_is_lagoon()	0

#define early_machine_is_scuba()	0

#define early_machine_is_scuba()	0

#define early_machine_is_scubaiot()	0

#define early_machine_is_scubaiot()	0
@@ -176,6 +182,8 @@ enum msm_cpu { 
	MSM_CPU_BENGAL,

	MSM_CPU_BENGAL,

	MSM_CPU_BENGALP,

	MSM_CPU_BENGALP,

	MSM_CPU_KHAJE,

	MSM_CPU_KHAJE,

	MSM_CPU_KHAJEP,

	MSM_CPU_KHAJEQ,

	MSM_CPU_LAGOON,

	MSM_CPU_LAGOON,

	MSM_CPU_SCUBA,

	MSM_CPU_SCUBA,

	MSM_CPU_SCUBAIOT,

	MSM_CPU_SCUBAIOT,