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

Commit 8791def5 authored by Maria Yu's avatar Maria Yu Committed by Xiaocheng Li
Browse files

msm: socinfo: Add socinfo for MSM8939 



Add SOC information like Chip ID, macros, CPU identifier function
and dummy socinfo definitions for MSM8939.

Change-Id: I63f84776a356260af1ea54ef85cf003c6d65878e
Signed-off-by: default avatarMaria Yu <aiquny@codeaurora.org>
parent df52e0bc

arch/arm/mach-msm/board-8916.c

+14 −0
Original line number Diff line number Diff line
@@ -84,6 +84,11 @@ static const char *msm8936_dt_match[] __initconst = { 
	NULL

};



static const char *msm8939_dt_match[] __initconst = {

	"qcom,msm8939",

	NULL

};



DT_MACHINE_START(MSM8916_DT,

		"Qualcomm Technologies, Inc. MSM 8916 (Flattened Device Tree)")

	.map_io = msm8916_map_io,
@@ -93,6 +98,15 @@ DT_MACHINE_START(MSM8916_DT, 
	.smp = &msm8916_smp_ops,

MACHINE_END



DT_MACHINE_START(MSM8939_DT,

		"Qualcomm Technologies, Inc. MSM 8939 (Flattened Device Tree)")

	.map_io = msm8916_map_io,

	.init_machine = msm8916_init,

	.dt_compat = msm8939_dt_match,

	.reserve = msm8916_dt_reserve,

	.smp = &msm8936_smp_ops,

MACHINE_END



DT_MACHINE_START(MSM8936_DT,

		"Qualcomm Technologies, Inc. MSM 8936 (Flattened Device Tree)")

	.map_io = msm8916_map_io,

drivers/soc/qcom/socinfo.c

+7 −0
Original line number Diff line number Diff line
@@ -456,6 +456,9 @@ static enum msm_cpu cpu_of_id[] = { 
	/* 8936 IDs */

	[233] = MSM_CPU_8936,



	/* 8939 IDs */

	[239] = MSM_CPU_8939,



	/* ZIRC IDs */

	[234] = MSM_CPU_ZIRC,

	[235] = MSM_CPU_ZIRC,
@@ -936,6 +939,10 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 206;

		strlcpy(dummy_socinfo.build_id, "msm8916 - ",

			sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_msm8939()) {

		dummy_socinfo.id = 239;

		strlcpy(dummy_socinfo.build_id, "msm8939 - ",

			sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_msm8936()) {

		dummy_socinfo.id = 233;

		strlcpy(dummy_socinfo.build_id, "msm8936 - ",

include/soc/qcom/socinfo.h

+16 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ 
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8916")

#define early_machine_is_msm8936()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8936")

#define early_machine_is_msm8939()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8939")

#define early_machine_is_apq8084()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,apq8084")

#define early_machine_is_mdm9630()	\
@@ -96,6 +98,7 @@ 
#define early_machine_is_mpq8092()	0

#define early_machine_is_msm8916()	0

#define early_machine_is_msm8936()	0

#define early_machine_is_msm8939()	0

#define early_machine_is_apq8084()	0

#define early_machine_is_mdm9630()	0

#define early_machine_is_fsm9900()	0
@@ -141,6 +144,7 @@ enum msm_cpu { 
	MSM_CPU_8092,

	MSM_CPU_8916,

	MSM_CPU_8936,

	MSM_CPU_8939,

	MSM_CPU_8226,

	MSM_CPU_8610,

	MSM_CPU_8625Q,
@@ -525,6 +529,18 @@ static inline int cpu_is_msm8936(void) 


}



static inline int cpu_is_msm8939(void)

{

#ifdef CONFIG_ARCH_MSM8916

	enum msm_cpu cpu = socinfo_get_msm_cpu();



	BUG_ON(cpu == MSM_CPU_UNKNOWN);

	return cpu == MSM_CPU_8939;

#else

	return 0;

#endif



}



static inline int cpu_is_msm8226(void)

{