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

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

Merge "ARM: dts: msm: Add qcom_gadget node for SA415 standalone and PCIe EP"

parents e46872a7 748367c3

arch/arm/boot/dts/qcom/sa415m-ccard-pcie-ep.dts

+10 −0
Original line number Diff line number Diff line
@@ -19,6 +19,16 @@ 
	compatible = "qcom,sa415m-ccard",

		"qcom,sdxpoorwills", "qcom,ccard";

	qcom,board-id = <25 1>, <25 0x101>;



	qcom_gadget {

		compatible = "qcom,usb-gadget";

		qcom,vid = <0x05c6>;



		composition1 {

			qcom,pid = <0x9105>;

			qcom,composition = "diag.diag,gsi.dpl";

		};

	};

};



&usb {

arch/arm/boot/dts/qcom/sa415m-ccard-usb-ep.dts

+0 −5
Original line number Diff line number Diff line
@@ -30,11 +30,6 @@ 
		};



		composition2 {

			qcom,pid = <0x9105>;

			qcom,composition = "diag.diag,gsi.dpl";

		};



		composition3 {

			qcom,pid = <0x9107>;

			qcom,composition = "diag.diag,ipc.ipc,gsi.rmnet.v2x,gsi.ecm,gsi.dpl";

		};

arch/arm/boot/dts/qcom/sa415m-ccard.dts

+10 −0
Original line number Diff line number Diff line
@@ -19,4 +19,14 @@ 
	compatible = "qcom,sa415m-ccard",

		"qcom,sdxpoorwills", "qcom,ccard";

	qcom,board-id = <25 0>, <25 0x100>;



	qcom_gadget {

		compatible = "qcom,usb-gadget";

		qcom,vid = <0x05c6>;



		composition1 {

			qcom,pid = <0x90dc>;

			qcom,composition = "diag.diag,cser.dun.0,gsi.rmnet,gsi.dpl,qdss.qdss";

		};

	};

};

arch/arm/boot/dts/qcom/sa415m-ttp-pcie-ep.dts

+10 −0
Original line number Diff line number Diff line
@@ -20,6 +20,16 @@ 
	compatible = "qcom,sa415m-ttp",

			"qcom,sdxpoorwills", "qcom,ttp";

	qcom,board-id = <30 0x101>;



	qcom_gadget {

		compatible = "qcom,usb-gadget";

		qcom,vid = <0x05c6>;



		composition1 {

			qcom,pid = <0x9105>;

			qcom,composition = "diag.diag,gsi.dpl";

		};

	};

};



&mss_mem {

arch/arm/boot/dts/qcom/sa415m-ttp-usb-ep.dts

+0 −5
Original line number Diff line number Diff line
@@ -31,11 +31,6 @@ 
		};



		composition2 {

			qcom,pid = <0x9105>;

			qcom,composition = "diag.diag,gsi.dpl";

		};



		composition3 {

			qcom,pid = <0x9107>;

			qcom,composition = "diag.diag,ipc.ipc,gsi.rmnet.v2x,gsi.ecm,gsi.dpl";

		};