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

Commit 30b78ec0 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: socinfo: Add new msm-id for sdxprairie target"

parents d8cd992e bd837c8e

arch/arm64/boot/dts/qcom/sdxprairie-cdp.dts

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
	model = "Qualcomm Technologies, Inc. SDXPRAIRIE CDP";

	compatible = "qcom,sdxprairie-cdp",

		"qcom,sdxprairie", "qcom,cdp";

	qcom,board-id = <1 0x102>;

	qcom,board-id = <0x10001 0x0>, <0x4010001 0x0>;

};



&qnand_1 {

arch/arm64/boot/dts/qcom/sdxprairie-mtp.dts

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
	model = "Qualcomm Technologies, Inc. SDXPRAIRIE MTP";

	compatible = "qcom,sdxprairie-mtp",

		"qcom,sdxprairie", "qcom,mtp";

	qcom,board-id = <8 0x102>;

	qcom,board-id = <0x10008 0x0>,<0x4010008 0x0>;

};



&qnand_1 {

arch/arm64/boot/dts/qcom/sdxprairie.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
/ {

	model = "Qualcomm Technologies, Inc. SDXPRAIRIE";

	compatible = "qcom,sdxprairie";

	qcom,msm-id = <357 0x0>;

	qcom,msm-id = <357 0x10000>, <368 0x10000>;

	interrupt-parent = <&pdc>;



	reserved-memory {

drivers/soc/qcom/socinfo.c

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


	/* sdxprairie ID */

	[357] = {SDX_CPU_SDXPRAIRIE, "SDXPRAIRIE"},

	[368] = {SDX_CPU_SDXPRAIRIE, "SDXPRAIRIE"},



	/* sdmmagpie ID */

	[365] = {MSM_CPU_SDMMAGPIE, "SDMMAGPIE"},