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

Commit 8a878b63 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: socinfo: Add MSMCOBALT chip ID"

parents 5224b7b4 a25e3601

drivers/soc/qcom/socinfo.c

+9 −0
Original line number Diff line number Diff line
@@ -514,7 +514,12 @@ static struct msm_soc_info cpu_of_id[] = { 
	[270] = {MSM_CPU_8929, "MSM8229"},

	[271] = {MSM_CPU_8929, "APQ8029"},



	/* Cobalt ID */

	[292] = {MSM_CPU_COBALT, "MSMCOBALT"},



	/* Titanium ID */

	[293] = {MSM_CPU_TITANIUM, "MSMTITANIUM"},



	/* FERMIUM ID */

	[290] = {MSM_CPU_FERMIUM, "MDMFERMIUM"},

	[296] = {MSM_CPU_FERMIUM, "MDMFERMIUM"},
@@ -1129,6 +1134,10 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 290;

		strlcpy(dummy_socinfo.build_id, "mdmfermium - ",

			sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_msmcobalt()) {

		dummy_socinfo.id = 292;

		strlcpy(dummy_socinfo.build_id, "msmcobalt - ",

			sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_msmthorium()) {

		dummy_socinfo.id = 294;

		strlcpy(dummy_socinfo.build_id, "msmthorium - ",

include/soc/qcom/socinfo.h

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

#define early_machine_is_mdmfermium()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,mdmfermium")

#define early_machine_is_msmcobalt()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmcobalt")

#else

#define of_board_is_sim()		0

#define of_board_is_rumi()		0
@@ -131,6 +133,7 @@ 
#define early_machine_is_msm8929()	0

#define early_machine_is_mdmfermium()	0

#define early_machine_is_mdmcalifornium()	0

#define early_machine_is_msmcobalt()	0

#endif



#define PLATFORM_SUBTYPE_MDM	1
@@ -191,6 +194,7 @@ enum msm_cpu { 
	MSM_CPU_8929,

	MSM_CPU_FERMIUM,

	MSM_CPU_CALIFORNIUM,

	MSM_CPU_COBALT,

};



struct msm_soc_info {