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

Commit e9b94750 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 msm8917 soc-id"

parents a1a67589 630e245c

arch/arm/mach-qcom/board-msm8917.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


static const char *msm8917_dt_match[] __initconst = {

	"qcom,msm8917",

	"qcom,apq8017",

	NULL

};

drivers/soc/qcom/socinfo.c

+10 −0
Original line number Diff line number Diff line
@@ -621,6 +621,12 @@ static struct msm_soc_info cpu_of_id[] = { 
	[294] = {MSM_CPU_8937, "MSM8937"},

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



	/* MSM8917 IDs */

	[303] = {MSM_CPU_8917, "MSM8917"},

	[307] = {MSM_CPU_8917, "APQ8017"},

	[308] = {MSM_CPU_8917, "MSM8217"},

	[309] = {MSM_CPU_8917, "MSM8617"},



	/* SDM429 and SDM439 ID*/

	[353] = {MSM_CPU_SDM439, "SDM439"},

	[354] = {MSM_CPU_SDM429, "SDM429"},
@@ -1574,6 +1580,10 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 294;

		strlcpy(dummy_socinfo.build_id, "msm8937 - ",

			sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_msm8917()) {

		dummy_socinfo.id = 303;

		strlcpy(dummy_socinfo.build_id, "msm8917 - ",

			sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sdm450()) {

		dummy_socinfo.id = 338;

		strlcpy(dummy_socinfo.build_id, "sdm450 - ",

include/soc/qcom/socinfo.h

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

#define early_machine_is_msm8937()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8937")

#define early_machine_is_msm8917()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8917")

#define early_machine_is_mdm9607()      \

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,mdm9607")

#define early_machine_is_sdm450()	\
@@ -180,6 +182,7 @@ 
#define early_machine_is_sxr1120()	0

#define early_machine_is_msm8953()	0

#define early_machine_is_msm8937()	0

#define early_machine_is_msm8917()	0

#define early_machine_is_sdm450()	0

#define early_machine_is_sdm632()	0

#define early_machine_is_sdm439()	0
@@ -259,6 +262,7 @@ enum msm_cpu { 
	MSM_CPU_SDM632,

	MSM_CPU_SDA632,

	MSM_CPU_8937,

	MSM_CPU_8917,

	MSM_CPU_9607,

	MSM_CPU_SDM439,

	MSM_CPU_SDM429,