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

Commit 98c1e6b4 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 MSM8992 definitions"

parents cae9c1bd 60a841a8

drivers/soc/qcom/socinfo.c

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


	/* 8994 ID */

	[207] = {MSM_CPU_8994, "MSM8994"},



	/* 8992 ID */

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



	/* Uninitialized IDs are not known to run Linux.

	   MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are

	   considered as unknown CPU. */
@@ -977,6 +981,10 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 207;

		strlcpy(dummy_socinfo.build_id, "msm8994 - ",

			sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_msm8992()) {

		dummy_socinfo.id = 251;

		strlcpy(dummy_socinfo.build_id, "msm8992 - ",

			sizeof(dummy_socinfo.build_id));

	}



	strlcat(dummy_socinfo.build_id, "Dummy socinfo",

include/soc/qcom/socinfo.h

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

#define early_machine_is_msm8994()	\

	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")

#else

#define of_board_is_sim()		0

#define of_board_is_rumi()		0
@@ -150,6 +152,7 @@ enum msm_cpu { 
	FSM_CPU_9900,

	MSM_CPU_ZIRC,

	MSM_CPU_8994,

	MSM_CPU_8992,

};



struct msm_soc_info {