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

Commit c2d4b825 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 SDA439/SDA429 soc-id"

parents 9d41aea7 89b9927c

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

+10 −0
Original line number Diff line number Diff line
@@ -122,9 +122,15 @@ SoCs: 
- SDM439

  compatible = "qcom,sdm439"



- SDA439

  compatible = "qcom,sda439"



- SDM429

  compatible = "qcom,sdm429"



- SDA429

  compatible = "qcom,sda429"



- MDM9640

  compatible = "qcom,mdm9640"
@@ -334,9 +340,13 @@ compatible = "qcom,msm8937-pmi8937-qrd-sku2" 
compatible = "qcom,sdm429-cdp"

compatible = "qcom,sdm429-mtp"

compatible = "qcom,sdm429-qrd"

compatible = "qcom,sda429-cdp"

compatible = "qcom,sda429-mtp"

compatible = "qcom,sdm439-cdp"

compatible = "qcom,sdm439-mtp"

compatible = "qcom,sdm439-qrd"

compatible = "qcom,sda439-cdp"

compatible = "qcom,sda439-mtp"

compatible = "qcom,msm8953-rumi"

compatible = "qcom,msm8953-sim"

compatible = "qcom,msm8953-cdp"

drivers/soc/qcom/socinfo.c

+10 −0
Original line number Diff line number Diff line
@@ -617,6 +617,8 @@ static struct msm_soc_info cpu_of_id[] = { 
	/* SDM429 and SDM439 ID*/

	[353] = {MSM_CPU_SDM439, "SDM439"},

	[354] = {MSM_CPU_SDM429, "SDM429"},

	[363] = {MSM_CPU_SDA439, "SDA439"},

	[364] = {MSM_CPU_SDA429, "SDA429"},



	/* Uninitialized IDs are not known to run Linux.

	 * MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are
@@ -1573,6 +1575,14 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 354;

		strlcpy(dummy_socinfo.build_id, "sdm429 - ",

				sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sda439()) {

		dummy_socinfo.id = 363;

		strlcpy(dummy_socinfo.build_id, "sda439 - ",

				sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sda429()) {

		dummy_socinfo.id = 364;

		strlcpy(dummy_socinfo.build_id, "sda429 - ",

				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

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

#define early_machine_is_sdm429()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdm429")

#define early_machine_is_sda439()	\

	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_mdm9650()	\

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

#else
@@ -174,6 +178,8 @@ 
#define early_machine_is_sdm632()	0

#define early_machine_is_sdm439()	0

#define early_machine_is_sdm429()	0

#define early_machine_is_sda439()	0

#define early_machine_is_sda429()	0

#define early_machine_is_mdm9650()     0

#endif
@@ -248,6 +254,8 @@ enum msm_cpu { 
	MSM_CPU_9607,

	MSM_CPU_SDM439,

	MSM_CPU_SDM429,

	MSM_CPU_SDA439,

	MSM_CPU_SDA429,

	MSM_CPU_9650,

};