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

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

Merge "ARM: dts: msm: Fix DP and USB0 concurrency on SA8155-VM"

parents c02c0d87 23f023eb

arch/arm64/boot/dts/qcom/sa8155-vm-usb.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ 
			compatible = "snps,dwc3";

			reg = <0x0a600000 0xcd00>;

			interrupts = <0 133 0>;

			usb-phy = <&usb2_phy0>, <&usb_qmp_dp_phy>;

			usb-phy = <&usb2_phy0>, <&usb_nop_phy>;

			linux,sysdev_is_parent;

			snps,disable-clk-gating;

			snps,has-lpm-erratum;
@@ -74,7 +74,7 @@ 
			snps,usb3-u1u2-disable;

			usb-core-id = <0>;

			tx-fifo-resize;

			maximum-speed = "super-speed-plus";

			maximum-speed = "high-speed";

			dr_mode = "otg";

		};

arch/arm64/boot/dts/qcom/sa8155-vm.dts

+0 −4
Original line number Diff line number Diff line
@@ -29,7 +29,3 @@ 
&usb2_phy0 {

	status = "ok";

};
 


&usb_qmp_dp_phy {

	status = "ok";

};