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

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

Merge "soc: qcom: Add support for bengal variants into socinfo driver"

parents f6f7ac90 f04d21ca

drivers/soc/qcom/socinfo.c

+8 −0
Original line number Diff line number Diff line
@@ -324,10 +324,14 @@ static struct msm_soc_info cpu_of_id[] = { 


	/* Bengal ID */

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

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



	/* Lagoon ID */

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



	/* Bengalp ID */

	[445] = {MSM_CPU_BENGALP, "BENGALP"},



	/* Scuba ID */

	[441] = {MSM_CPU_SCUBA, "SCUBA"},
@@ -1202,6 +1206,10 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 417;

		strlcpy(dummy_socinfo.build_id, "bengal - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_bengalp()) {

		dummy_socinfo.id = 445;

		strlcpy(dummy_socinfo.build_id, "bengalp - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_lagoon()) {

		dummy_socinfo.id = 434;

		strlcpy(dummy_socinfo.build_id, "lagoon - ",

include/soc/qcom/socinfo.h

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

#define early_machine_is_bengal()	\

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

#define early_machine_is_bengalp()	\

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

#define early_machine_is_lagoon()	\

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

#define early_machine_is_scuba()	\
@@ -95,6 +97,7 @@ 
#define early_machine_is_kona()		0

#define early_machine_is_lito()		0

#define early_machine_is_bengal()	0

#define early_machine_is_bengalp()	0

#define early_machine_is_lagoon()	0

#define early_machine_is_scuba()	0

#define early_machine_is_sdmshrike()	0
@@ -127,6 +130,7 @@ enum msm_cpu { 
	MSM_CPU_KONA,

	MSM_CPU_LITO,

	MSM_CPU_BENGAL,

	MSM_CPU_BENGALP,

	MSM_CPU_LAGOON,

	MSM_CPU_SCUBA,

	MSM_CPU_SDMSHRIKE,