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

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

Merge "msm: socinfo: Add socinfo for fsm9010"

parents 52d54747 24bd2597

drivers/soc/qcom/socinfo.c

+5 −0
Original line number Diff line number Diff line
@@ -476,6 +476,11 @@ static struct msm_soc_info cpu_of_id[] = { 
	/* 8992 ID */

	[251] = {MSM_CPU_8992, "MSM8992"},



	/* FSM9010 ID */

	[254] = {FSM_CPU_9010, "FSM9010"},

	[255] = {FSM_CPU_9010, "FSM9010"},

	[256] = {FSM_CPU_9010, "FSM9010"},

	[257] = {FSM_CPU_9010, "FSM9010"},

	/* Uninitialized IDs are not known to run Linux.

	   MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are

	   considered as unknown CPU. */

include/soc/qcom/socinfo.h

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

#define early_machine_is_msm8992()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8992")

#define early_machine_is_fsm9010()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,fsm9010")

#else

#define of_board_is_sim()		0

#define of_board_is_rumi()		0
@@ -102,6 +104,7 @@ 
#define early_machine_is_apq8084()	0

#define early_machine_is_mdm9630()	0

#define early_machine_is_fsm9900()	0

#define early_machine_is_fsm9010()	0

#endif



#define PLATFORM_SUBTYPE_MDM	1
@@ -153,6 +156,7 @@ enum msm_cpu { 
	MSM_CPU_ZIRC,

	MSM_CPU_8994,

	MSM_CPU_8992,

	FSM_CPU_9010,

};



struct msm_soc_info {