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

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

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

parents 65d6579e ba4ca41a

drivers/soc/qcom/socinfo.c

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

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



	/* Khajeg ID */

	[585] = {MSM_CPU_KHAJEG, "KAHJEG"},



	/* Lagoon ID */

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

	[459] = {MSM_CPU_LAGOON, "LAGOON"},
@@ -1285,6 +1288,10 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 562;

		strlcpy(dummy_socinfo.build_id, "khajeq - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_khajeg()) {

		dummy_socinfo.id = 585;

		strlcpy(dummy_socinfo.build_id, "khajeg - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_bengalp()) {

		dummy_socinfo.id = 445;

		strlcpy(dummy_socinfo.build_id, "bengalp - ",

include/soc/qcom/socinfo.h

+4 −0
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ 
	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_khajeg()       \

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,khajeg")

#define early_machine_is_lagoon()	\

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

#define early_machine_is_scuba()	\
@@ -136,6 +138,7 @@ 
#define early_machine_is_khaje()	0

#define early_machine_is_khajep()	0

#define early_machine_is_khajeq()	0

#define early_machine_is_khajeg()	0

#define early_machine_is_lagoon()	0

#define early_machine_is_scuba()	0

#define early_machine_is_scubaiot()	0
@@ -187,6 +190,7 @@ enum msm_cpu { 
	MSM_CPU_KHAJE,

	MSM_CPU_KHAJEP,

	MSM_CPU_KHAJEQ,

	MSM_CPU_KHAJEG,

	MSM_CPU_LAGOON,

	MSM_CPU_SCUBA,

	MSM_CPU_SCUBAIOT,