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

Commit 83efda84 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: Disable usb phy by default on msm8996 vplatform"

parents 2ad3d8cb a1ef93ac

arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi-lv-mt.dts

+8 −0
Original line number Diff line number Diff line
@@ -105,3 +105,11 @@ 
	status = "okay";

	qcom,no-wakeup-src-in-hostmode;

};



&qusb_phy0 {

	status = "okay";

};



&ssphy {

	status = "okay";

};

arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi.dts

+12 −0
Original line number Diff line number Diff line
@@ -85,3 +85,15 @@ 
&usb2s {

	status = "okay";

};



&qusb_phy0 {

	status = "okay";

};



&qusb_phy1 {

	status = "okay";

};



&ssphy {

	status = "okay";

};

arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-telematics.dts

+8 −0
Original line number Diff line number Diff line
@@ -190,3 +190,11 @@ 
	status = "okay";

	qcom,no-wakeup-src-in-hostmode;

};



&qusb_phy0 {

	status = "okay";

};



&ssphy {

	status = "okay";

};

arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-usb.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -243,6 +243,7 @@ 


		resets = <&clock_virt QUSB2PHY_PRIM_BCR>;

		reset-names = "phy_reset";

		status = "disabled";

	};



	qusb_phy1: qusb@7412000 {
@@ -280,6 +281,7 @@ 


		resets = <&clock_virt QUSB2PHY_SEC_BCR>;

		reset-names = "phy_reset";

		status = "disabled";

	};



	ssphy: ssphy@7410000 {
@@ -369,6 +371,7 @@ 
			 <&clock_virt USB3PHY_PHY_BCR>;

		reset-names = "phy_reset", "phy_phy_reset";

		qcom,disable-autonomous-mode;

		status = "disabled";

	};



	usb_nop_phy: usb_nop_phy {