commit b8f811fc928e0c6521ce98b7dba80112ddb3c12f
author Linux Build Service Account <lnxbuild@localhost> Wed Feb 19 05:30:32 2014 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Feb 19 05:30:31 2014 -0800
tree da578239fa494c18fbf366df66fe14053afe18eb
parent b8449940084c2c1ab5bcc514b03752f6503006cb
parent b39f0f99605b6c84c40a531ee6b88a4196aafd3c

Merge "ARM: dts: msm: Disable AHB2AHB bypass mode for non-LTE based platform"

arch/arm/boot/dts/msm8226.dtsi

diff --git a/arch/arm/boot/dts/msm8226.dtsi b/arch/arm/boot/dts/msm8226.dtsi
index eb97c8d..2b00cb0 100644
--- a/arch/arm/boot/dts/msm8226.dtsi
+++ b/arch/arm/boot/dts/msm8226.dtsi
@@ -282,8 +282,8 @@
 		qcom,hsusb-otg-phy-type = <2>;
 		qcom,hsusb-otg-mode = <1>;
 		qcom,hsusb-otg-otg-control = <2>;
+		qcom,hsusb-otg-disable-reset;
 		qcom,dp-manual-pullup;
-		qcom,ahb-async-bridge-bypass;
 		qcom,usbin-vadc = <&pm8226_vadc>;
 
 		qcom,msm-bus,name = "usb";

arch/arm/boot/dts/msm8926.dtsi

diff --git a/arch/arm/boot/dts/msm8926.dtsi b/arch/arm/boot/dts/msm8926.dtsi
index d6619a7..8a0e5c4 100644
--- a/arch/arm/boot/dts/msm8926.dtsi
+++ b/arch/arm/boot/dts/msm8926.dtsi
@@ -170,3 +170,9 @@
 	hsic,strobe-gpio = <&msmgpio 119 0x00>;
 	hsic,data-gpio = <&msmgpio 120 0x00>;
 };
+
+&usb_otg {
+	/delete-property/ qcom,hsusb-otg-disable-reset;
+	qcom,ahb-async-bridge-bypass;
+};
+