Merge "ARM: dts: msm: Fix DP and USB1 concurrency issue on all SA8155 designs" (03b5cbf6) · Commits · e / devices / android_kernel_oneplus_sm8150

arch/arm64/boot/dts/qcom/sa8155-adp-alcor.dtsi

+0 −6

Original line number	Diff line number	Diff line
		@@ -12,9 +12,3 @@

		#include "sa8155-adp-common.dtsi"
		#include "sa8155-adp-alcor-display.dtsi"

		&usb0 {
		dwc3@a600000 {
		maximum-speed = "high-speed";
		};
		};

+8 −0

Original line number	Diff line number	Diff line
		@@ -183,6 +183,10 @@

		&usb0 {
		qcom,host-poweroff-in-pm-suspend;
		dwc3@a600000 {
		usb-phy = <&usb2_phy0>, <&usb_nop_phy>;
		maximum-speed = "high-speed";
		};
		};

		&usb2_phy0 {
		@@ -193,6 +197,10 @@
		pinctrl-0 = <&usb2phy_ac_en1_default>;
		};

		&usb_qmp_dp_phy {
		status = "disabled";
		};

		&usb1 {
		status = "ok";
		qcom,default-mode-host;