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

Commit 25946d39 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: socinfo: Add soc information for SDM660"

parents 8b8e8126 289b35f3

Documentation/devicetree/bindings/arm/msm/msm.txt

+6 −0
Original line number Diff line number Diff line
@@ -88,6 +88,9 @@ SoCs: 
- QCS410

  compatible = "qcom,qcs410"



- SDM660

  compatible = "qcom,sdm660"



Generic board variants:



- CDP device:
@@ -251,3 +254,6 @@ compatible = "qcom,atoll-ab-qrd" 
compatible = "qcom,qcs610-iot"

compatible = "qcom,qcs410-iot"

compatible = "qcom,mdm9607-mtp"

compatible = "qcom,sdm660-cdp"

compatible = "qcom,sdm660-mtp"

compatible = "qcom,sdm660-qrd"

drivers/soc/qcom/socinfo.c

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

	[443] = {MSM_CPU_ATOLL_AB, "ATOLL-AB"},



	/* SDM660 ID */

	[317] = {MSM_CPU_SDM660, "SDM660"},



	/* Uninitialized IDs are not known to run Linux.

	 * MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are

	 * considered as unknown CPU.
@@ -1435,6 +1438,10 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 443;

		strlcpy(dummy_socinfo.build_id, "atoll-ab - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sdm660()) {

		dummy_socinfo.id = 317;

		strlcpy(dummy_socinfo.build_id, "sdm660 - ",

		sizeof(dummy_socinfo.build_id));

	} else

		strlcat(dummy_socinfo.build_id, "Dummy socinfo",

			sizeof(dummy_socinfo.build_id));

include/soc/qcom/socinfo.h

+4 −0
Original line number Diff line number Diff line
@@ -109,6 +109,8 @@ 
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,atollp")

#define early_machine_is_atoll_ab()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,atoll-ab")

#define early_machine_is_sdm660()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdm660")

#else

#define of_board_is_sim()		0

#define of_board_is_rumi()		0
@@ -152,6 +154,7 @@ 
#define early_machine_is_qcs410()       0

#define early_machine_is_atoll()	0

#define early_machine_is_atollp()	0

#define early_machine_is_sdm660()	0

#endif



#define PLATFORM_SUBTYPE_MDM	1
@@ -198,6 +201,7 @@ enum msm_cpu { 
	MSM_CPU_ATOLL,

	MSM_CPU_ATOLLP,

	MSM_CPU_ATOLL_AB,

	MSM_CPU_SDM660,

};



struct msm_soc_info {