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

Commit 07535729 authored by Anurag Chouhan's avatar Anurag Chouhan Committed by Gerrit - the friendly Code Review server
Browse files

soc: qcom: socinfo: Add support for QCM6125/QCS6125 soc-id 



Add socinfo support for QCM6125/QCS6125 Soc and update the
bindings for the same.

Change-Id: Ia2a9729e6b668559393c6660deca2da97f545c67
Signed-off-by: default avatarAnurag Chouhan <achouhan@codeaurora.org>
parent be1961a6

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

+8 −0
Original line number Diff line number Diff line
@@ -106,6 +106,12 @@ SoCs: 
- SDA429W

  compatible = "qcom,sda429w"



- QCM6125

  compatible = "qcom,qcm6125"



- QCS6125

  compatible = "qcom,qcs6125"



Generic board variants:



- CDP device:
@@ -299,3 +305,5 @@ compatible = "qcom,sda429w-wdp" 
compatible = "qcom,sda429-wdp"

compatible = "qcom,sdm429w-wdp"

compatible = "qcom,sdm429-wdp"

compatible = "qcom,qcm6125"

compatible = "qcom,qcs6125"

drivers/soc/qcom/socinfo.c

+12 −0
Original line number Diff line number Diff line
@@ -451,6 +451,10 @@ static struct msm_soc_info cpu_of_id[] = { 
	[416] = {MSM_CPU_SDM429W, "SDM429W"},

	[437] = {MSM_CPU_SDA429W, "SDA429W"},



	/* QCM6125 IDs*/

	[467] = {MSM_CPU_QCM6125, "QCM6125"},

	[468] = {MSM_CPU_QCS6125, "QCS6125"},



	/* Uninitialized IDs are not known to run Linux.

	 * MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are

	 * considered as unknown CPU.
@@ -1463,6 +1467,14 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 437;

		strlcpy(dummy_socinfo.build_id, "sda429w - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_qcm6125()) {

		dummy_socinfo.id = 467;

		strlcpy(dummy_socinfo.build_id, "qcm6125 - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_qcs6125()) {

		dummy_socinfo.id = 468;

		strlcpy(dummy_socinfo.build_id, "qcm6125 - ",

		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
@@ -117,6 +117,10 @@ 
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdm429w")

#define early_machine_is_sda429w()       \

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sda429w")

#define early_machine_is_qcm6125()       \

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,qcm6125")

#define early_machine_is_qcs6125()       \

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,qcs6125")

#else

#define of_board_is_sim()		0

#define of_board_is_rumi()		0
@@ -164,6 +168,8 @@ 
#define early_machine_is_sda660()	0

#define early_machine_is_sdm429w()	0

#define early_machine_is_sda429w()	0

#define early_machine_is_qcm6125()	0

#define early_machine_is_qcs6125()	0

#endif



#define PLATFORM_SUBTYPE_MDM	1
@@ -214,6 +220,8 @@ enum msm_cpu { 
	MSM_CPU_SDA660,

	MSM_CPU_SDM429W,

	MSM_CPU_SDA429W,

	MSM_CPU_QCM6125,

	MSM_CPU_QCS6125,

};



struct msm_soc_info {