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

Commit 8a246c6b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: socinfo: Add support for SDM429W soc-id"

parents 635c754b 2b289c81

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

+4 −0
Original line number Diff line number Diff line
@@ -146,6 +146,9 @@ SoCs: 
- SDA429

  compatible = "qcom,sda429"



- SDM429W

  compatible = "qcom,sdm429w"



- QM215

  compatible = "qcom, qm215"
@@ -366,6 +369,7 @@ compatible = "qcom,msm8937-pmi8937-qrd-sku2" 
compatible = "qcom,sdm429-cdp"

compatible = "qcom,sdm429-mtp"

compatible = "qcom,sdm429-qrd"

compatible = "qcom,sdm429w-qrd"

compatible = "qcom,sda429-cdp"

compatible = "qcom,sda429-mtp"

compatible = "qcom,sdm439-cdp"

drivers/soc/qcom/socinfo.c

+7 −0
Original line number Diff line number Diff line
@@ -642,6 +642,9 @@ static struct msm_soc_info cpu_of_id[] = { 


	/* QM215 ID */

	[386] = {MSM_CPU_QM215, "QM215"},



	/* SDM429W IDs*/

	[416] = {MSM_CPU_SDM429W, "SDM429W"},

	/* Uninitialized IDs are not known to run Linux.

	 * MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are

	 * considered as unknown CPU.
@@ -1629,6 +1632,10 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 364;

		strlcpy(dummy_socinfo.build_id, "sda429 - ",

				sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sdm429w()) {

		dummy_socinfo.id = 416;

		strlcpy(dummy_socinfo.build_id, "sdm429w - ",

				sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_mdm9607()) {

		dummy_socinfo.id = 290;

		strlcpy(dummy_socinfo.build_id, "mdm9607 - ",

include/soc/qcom/socinfo.h

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

#define early_machine_is_sda429()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sda429")

#define early_machine_is_sdm429w()       \

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdm429w")

#define early_machine_is_mdm9650()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,mdm9650")

#define early_machine_is_qm215()	\
@@ -199,6 +201,7 @@ 
#define early_machine_is_sdm429()	0

#define early_machine_is_sda439()	0

#define early_machine_is_sda429()	0

#define early_machine_is_sdm429w()      0

#define early_machine_is_mdm9650()     0

#define early_machine_is_qm215()	0

#define early_machine_is_sdm712()	0
@@ -283,6 +286,7 @@ enum msm_cpu { 
	MSM_CPU_SDM429,

	MSM_CPU_SDA439,

	MSM_CPU_SDA429,

	MSM_CPU_SDM429W,

	MSM_CPU_9650,

	MSM_CPU_QM215,

};