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

Commit 1245b31d 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 support for sdxhedgehog"

parents 1115b8cf 028ce97d

drivers/soc/qcom/socinfo.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -570,6 +570,9 @@ static struct msm_soc_info cpu_of_id[] = { 
	[285] = {MSM_CPU_CALIFORNIUM, "MDMCALIFORNIUM"},

	[285] = {MSM_CPU_CALIFORNIUM, "MDMCALIFORNIUM"},

	[286] = {MSM_CPU_CALIFORNIUM, "MDMCALIFORNIUM"},

	[286] = {MSM_CPU_CALIFORNIUM, "MDMCALIFORNIUM"},





	/* Hedgehog IDs */

	[314] = {SDX_CPU_HEDGEHOG, "SDXHEDGEHOG"},



	/*MSM8937 ID  */

	/*MSM8937 ID  */

	[294] = {MSM_CPU_8937, "MSM8937"},

	[294] = {MSM_CPU_8937, "MSM8937"},

	[295] = {MSM_CPU_8937, "APQ8937"},

	[295] = {MSM_CPU_8937, "APQ8937"},
@@ -1227,6 +1230,10 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 286;

		dummy_socinfo.id = 286;

		strlcpy(dummy_socinfo.build_id, "mdmcalifornium - ",

		strlcpy(dummy_socinfo.build_id, "mdmcalifornium - ",

			sizeof(dummy_socinfo.build_id));

			sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sdxhedgehog()) {

		dummy_socinfo.id = 314;

		strlcpy(dummy_socinfo.build_id, "sdxhedgehog - ",

			sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_msm8994()) {

	} else if (early_machine_is_msm8994()) {

		dummy_socinfo.id = 207;

		dummy_socinfo.id = 207;

		strlcpy(dummy_socinfo.build_id, "msm8994 - ",

		strlcpy(dummy_socinfo.build_id, "msm8994 - ",

include/soc/qcom/socinfo.h

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

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,mdm9640")

#define early_machine_is_mdmcalifornium()	\

#define early_machine_is_mdmcalifornium()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,mdmcalifornium")

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,mdmcalifornium")

#define early_machine_is_sdxhedgehog()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdxhedgehog")

#define early_machine_is_fsm9900()	\

#define early_machine_is_fsm9900()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,fsm9900")

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,fsm9900")

#define early_machine_is_msm8994()	\

#define early_machine_is_msm8994()	\
@@ -142,6 +144,7 @@ 
#define early_machine_is_msm8929()	0

#define early_machine_is_msm8929()	0

#define early_machine_is_mdm9607()	0

#define early_machine_is_mdm9607()	0

#define early_machine_is_mdmcalifornium()	0

#define early_machine_is_mdmcalifornium()	0

#define early_machine_is_sdxhedgehog()	0

#define early_machine_is_msmcobalt()	0

#define early_machine_is_msmcobalt()	0

#endif

#endif
@@ -207,6 +210,7 @@ enum msm_cpu { 
	MSM_CPU_9607,

	MSM_CPU_9607,

	MSM_CPU_CALIFORNIUM,

	MSM_CPU_CALIFORNIUM,

	MSM_CPU_COBALT,

	MSM_CPU_COBALT,

	SDX_CPU_HEDGEHOG,

};

};





struct msm_soc_info {

struct msm_soc_info {