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

Commit 4eab1820 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: Add support for qcs610/qcs410 into socinfo driver"

parents 334a2937 057fcb16

drivers/soc/qcom/socinfo.c

+14 −0
Original line number Diff line number Diff line
@@ -378,6 +378,12 @@ static struct msm_soc_info cpu_of_id[] = { 
	/* trinket ID */

	[394] = {MSM_CPU_TRINKET, "TRINKET"},



	/* qcs610 ID */

	[401] = {MSM_CPU_QCS610, "QCS610"},



	/* qcs410 ID */

	[406] = {MSM_CPU_QCS410, "QCS410"},



	/* Uninitialized IDs are not known to run Linux.

	 * MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are

	 * considered as unknown CPU.
@@ -1306,6 +1312,14 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 394;

		strlcpy(dummy_socinfo.build_id, "trinket - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_qcs610()) {

		dummy_socinfo.id = 401;

		strlcpy(dummy_socinfo.build_id, "qcs610 - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_qcs410()) {

		dummy_socinfo.id = 406;

		strlcpy(dummy_socinfo.build_id, "qcs410 - ",

		sizeof(dummy_socinfo.build_id));

	} else

		strlcat(dummy_socinfo.build_id, "Dummy socinfo",

			sizeof(dummy_socinfo.build_id));

include/soc/qcom/socinfo.h

+8 −0
Original line number Diff line number Diff line
@@ -91,6 +91,10 @@ 
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sa6155")

#define early_machine_is_trinket()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,trinket")

#define early_machine_is_qcs610()      \

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,qcs610")

#define early_machine_is_qcs410()      \

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,qcs410")

#else

#define of_board_is_sim()		0

#define of_board_is_rumi()		0
@@ -126,6 +130,8 @@ 
#define early_machine_is_sa4155p()	0

#define early_machine_is_sa6155()	0

#define early_machine_is_trinket()	0

#define early_machine_is_qcs610()       0

#define early_machine_is_qcs410()       0

#endif



#define PLATFORM_SUBTYPE_MDM	1
@@ -163,6 +169,8 @@ enum msm_cpu { 
	MSM_CPU_SA4155P,

	MSM_CPU_SA6155,

	MSM_CPU_TRINKET,

	MSM_CPU_QCS610,

	MSM_CPU_QCS410,

};



struct msm_soc_info {