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

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

Merge "soc: qcom: socinfo: Add support for Kona-7230 soc-id"

parents 8c95e6b8 aac2ecbb

drivers/soc/qcom/socinfo.c

+7 −0
Original line number Diff line number Diff line
@@ -324,6 +324,9 @@ static struct msm_soc_info cpu_of_id[] = { 
	[455] = {MSM_CPU_KONA, "KONA"},

	[496] = {MSM_CPU_KONA, "KONA"},



	/* kona-7230-iot ID */

	[548] = {MSM_CPU_KONA_IOT, "KONA-7230-IOT"},



	/* Lito ID */

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

	[440] = {MSM_CPU_LITO, "LITO"},
@@ -1358,6 +1361,10 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 338;

		strlcpy(dummy_socinfo.build_id, "sdm450 - ",

			sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_kona_7230_iot()) {

		dummy_socinfo.id = 548;

		strlcpy(dummy_socinfo.build_id, "kona-7230-iot - ",

		sizeof(dummy_socinfo.build_id));

	} else

		strlcat(dummy_socinfo.build_id, "Dummy socinfo",

			sizeof(dummy_socinfo.build_id));

include/soc/qcom/socinfo.h

+3 −0
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ 
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sa8150")

#define early_machine_is_kona()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,kona")

#define early_machine_is_kona_7230_iot()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,kona-7230-iot")

#define early_machine_is_lito()	\

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

#define early_machine_is_orchid()	\
@@ -177,6 +179,7 @@ enum msm_cpu { 
	MSM_CPU_SM8150,

	MSM_CPU_SA8150,

	MSM_CPU_KONA,

	MSM_CPU_KONA_IOT,

	MSM_CPU_LITO,

	MSM_CPU_ORCHID,

	MSM_CPU_BENGAL,