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

Commit 7fc2d678 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 supprot for QM215 QRD soc-id"

parents 39e518d5 f3a81988

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

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

  compatible = "qcom,sda429"



- QM215

  compatible = "qcom, qm215"



- MDM9640

  compatible = "qcom,mdm9640"
@@ -364,6 +367,7 @@ compatible = "qcom,sdm439-mtp" 
compatible = "qcom,sdm439-qrd"

compatible = "qcom,sda439-cdp"

compatible = "qcom,sda439-mtp"

compatible = "qcom,qm215-qrd"

compatible = "qcom,msm8953-rumi"

compatible = "qcom,msm8953-sim"

compatible = "qcom,msm8953-cdp"

drivers/soc/qcom/socinfo.c

+6 −0
Original line number Diff line number Diff line
@@ -633,6 +633,8 @@ static struct msm_soc_info cpu_of_id[] = { 
	[363] = {MSM_CPU_SDA439, "SDA439"},

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



	/* QM215 ID */

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

	/* Uninitialized IDs are not known to run Linux.

	 * MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are

	 * considered as unknown CPU.
@@ -1612,6 +1614,10 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 290;

		strlcpy(dummy_socinfo.build_id, "mdm9607 - ",

				sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_qm215()) {

		dummy_socinfo.id = 386;

		strlcpy(dummy_socinfo.build_id, "qm215 - ",

				sizeof(dummy_socinfo.build_id));

	}



	strlcat(dummy_socinfo.build_id, "Dummy socinfo",

include/soc/qcom/socinfo.h

+4 −0
Original line number Diff line number Diff line
@@ -134,6 +134,8 @@ 
	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")

#define early_machine_is_qm215()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,qm215")

#else

#define of_board_is_sim()		0

#define of_board_is_rumi()		0
@@ -190,6 +192,7 @@ 
#define early_machine_is_sda439()	0

#define early_machine_is_sda429()	0

#define early_machine_is_mdm9650()     0

#define early_machine_is_qm215()	0

#endif



#define PLATFORM_SUBTYPE_MDM	1
@@ -269,6 +272,7 @@ enum msm_cpu { 
	MSM_CPU_SDA439,

	MSM_CPU_SDA429,

	MSM_CPU_9650,

	MSM_CPU_QM215,

};



struct msm_soc_info {