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

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

Merge "soc: qcom: Add soc information for Orchid SoC"

parents fe2d5646 8a78d737

drivers/soc/qcom/socinfo.c

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

	[400] = {MSM_CPU_LITO, "LITO"},



	/* Orchid ID */

	[476] = {MSM_CPU_ORCHID, "ORCHID"},



	/* Bengal ID */

	[417] = {MSM_CPU_BENGAL, "BENGAL"},

	[444] = {MSM_CPU_BENGAL, "BENGAL"},
@@ -1219,6 +1222,10 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 400;

		strlcpy(dummy_socinfo.build_id, "lito - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_orchid()) {

		dummy_socinfo.id = 476;

		strlcpy(dummy_socinfo.build_id, "orchid - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_bengal()) {

		dummy_socinfo.id = 417;

		strlcpy(dummy_socinfo.build_id, "bengal - ",

include/soc/qcom/socinfo.h

+4 −0
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ 
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,kona")

#define early_machine_is_lito()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,lito")

#define early_machine_is_orchid()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,orchid")

#define early_machine_is_bengal()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,bengal")

#define early_machine_is_bengalp()	\
@@ -102,6 +104,7 @@ 
#define early_machine_is_sa8150()	0

#define early_machine_is_kona()		0

#define early_machine_is_lito()		0

#define early_machine_is_orchid()	0

#define early_machine_is_bengal()	0

#define early_machine_is_bengalp()	0

#define early_machine_is_lagoon()	0
@@ -139,6 +142,7 @@ enum msm_cpu { 
	MSM_CPU_SA8150,

	MSM_CPU_KONA,

	MSM_CPU_LITO,

	MSM_CPU_ORCHID,

	MSM_CPU_BENGAL,

	MSM_CPU_BENGALP,

	MSM_CPU_LAGOON,