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

Commit 5e775806 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 MSM8936"

parents b4c6a9d9 ff401cc6

drivers/soc/qcom/socinfo.c

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

	[206] = MSM_CPU_8916,



	/* 8936 IDs */

	[233] = MSM_CPU_8936,



	/* Uninitialized IDs are not known to run Linux.

	   MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are

	   considered as unknown CPU. */
@@ -893,6 +896,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_msm8936()) {

		dummy_socinfo.id = 233;

		strlcpy(dummy_socinfo.build_id, "msm8936 - ",

			sizeof(dummy_socinfo.build_id));

	}



	strlcat(dummy_socinfo.build_id, "Dummy socinfo",

include/soc/qcom/socinfo.h

+18 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ 
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,mpq8092")

#define early_machine_is_msm8916()	\

	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_apq8084()	\

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

#define early_machine_is_mdm9630()	\
@@ -89,6 +91,7 @@ 
#define early_machine_is_msm8610()	0

#define early_machine_is_mpq8092()	0

#define early_machine_is_msm8916()	0

#define early_machine_is_msm8936()	0

#define early_machine_is_apq8084()	0

#define early_machine_is_mdm9630()	0

#define early_machine_is_fsm9900()	0
@@ -133,6 +136,7 @@ enum msm_cpu { 
	MSM_CPU_9625,

	MSM_CPU_8092,

	MSM_CPU_8916,

	MSM_CPU_8936,

	MSM_CPU_8226,

	MSM_CPU_8610,

	MSM_CPU_8625Q,
@@ -502,6 +506,20 @@ static inline int cpu_is_msm8916(void) 


}



static inline int cpu_is_msm8936(void)

{

#ifdef CONFIG_ARCH_MSM8916

	enum msm_cpu cpu = socinfo_get_msm_cpu();



	BUG_ON(cpu == MSM_CPU_UNKNOWN);

	return cpu == MSM_CPU_8936;

#else

	return 0;

#endif



}





static inline int cpu_is_msm8226(void)

{

#ifdef CONFIG_ARCH_MSM8226