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

Commit 267c1da6 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drivers: soc: qcom: Add SDMBAT chip id" into msm-4.8

parents 120a0116 eee60c9d

drivers/soc/qcom/socinfo.c

+7 −0
Original line number Diff line number Diff line
@@ -541,6 +541,9 @@ static struct msm_soc_info cpu_of_id[] = { 
	/* Skunk ID */

	[321] = {MSM_CPU_SKUNK, "MSMSKUNK"},



	/* Bat ID */

	[328] = {MSM_CPU_BAT, "SDMBAT"},



	/* Uninitialized IDs are not known to run Linux.

	 * MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are

	 * considered as unknown CPU.
@@ -1222,6 +1225,10 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 321;

		strlcpy(dummy_socinfo.build_id, "msmskunk - ",

			sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sdmbat()) {

		dummy_socinfo.id = 328;

		strlcpy(dummy_socinfo.build_id, "sdmbat - ",

			sizeof(dummy_socinfo.build_id));

	}



	strlcat(dummy_socinfo.build_id, "Dummy socinfo",

include/soc/qcom/socinfo.h

+4 −1
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ 
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmfalcon")

#define early_machine_is_msmskunk()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmskunk")

#define early_machine_is_sdmbat()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdmbat")

#else

#define of_board_is_sim()		0

#define of_board_is_rumi()		0
@@ -136,6 +138,7 @@ 
#define early_machine_is_msmhamster()	0

#define early_machine_is_msmfalcon()	0

#define early_machine_is_msmskunk()	0

#define early_machine_is_sdmbat()	0

#endif



#define PLATFORM_SUBTYPE_MDM	1
@@ -196,7 +199,7 @@ enum msm_cpu { 
	MSM_CPU_HAMSTER,

	MSM_CPU_FALCON,

	MSM_CPU_SKUNK,



	MSM_CPU_BAT,

};



struct msm_soc_info {