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

Commit ed7cc5b7 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 mdmferrum"

parents 871c3c29 ed3638d0

drivers/soc/qcom/socinfo.c

+3 −0
Original line number Diff line number Diff line
@@ -465,6 +465,9 @@ static struct msm_soc_info cpu_of_id[] = { 


	/* ferrum IDs */

	[245] = {MSM_CPU_FERRUM, "MSMFERRUM"},

	[260] = {MSM_CPU_FERRUM, "MDMFERRUM"},

	[261] = {MSM_CPU_FERRUM, "MDMFERRUM"},

	[262] = {MSM_CPU_FERRUM, "MDMFERRUM"},



	/* ZIRC IDs */

	[234] = {MSM_CPU_ZIRC, "MSMZIRC"},

include/soc/qcom/socinfo.h

+1 −1
Original line number Diff line number Diff line
@@ -500,7 +500,7 @@ static inline int cpu_is_msm8974pro_ac(void) 


static inline int cpu_is_msmferrum(void)

{

#ifdef CONFIG_ARCH_MSMFERRUM

#if defined(CONFIG_ARCH_MSMFERRUM) || defined(CONFIG_ARCH_MDMFERRUM)

	enum msm_cpu cpu = socinfo_get_msm_cpu();



	BUG_ON(cpu == MSM_CPU_UNKNOWN);