commit e3b1041c58197399f697892dc5d6761b22442bd9
author Linux Build Service Account <lnxbuild@localhost> Thu Apr 04 21:12:51 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Apr 04 21:12:50 2013 -0700
tree 56c5986a14039cf01191967fe7794bdcf74b5c92
parent b2d9a06a3d1f55643ab5d63ccf640f104b1a3de7
parent 59ce5878e08d684b5f2790a2f35f6c9156c8f6f1

Merge "arm/dt: msm8974: Enable PNOC BUS workaround only for V1"

arch/arm/boot/dts/msm8974-v1.dtsi

diff --git a/arch/arm/boot/dts/msm8974-v1.dtsi b/arch/arm/boot/dts/msm8974-v1.dtsi
index ae8cf83..62837a1 100644
--- a/arch/arm/boot/dts/msm8974-v1.dtsi
+++ b/arch/arm/boot/dts/msm8974-v1.dtsi
@@ -128,3 +128,7 @@
 &ldrex_spinlock {
 	status = "ok";
 };
+
+&usb_otg {
+	qcom,hsusb-otg-pnoc-errata-fix;
+};

arch/arm/boot/dts/msm8974.dtsi

diff --git a/arch/arm/boot/dts/msm8974.dtsi b/arch/arm/boot/dts/msm8974.dtsi
index 7e6c6d6..54ee9d4 100644
--- a/arch/arm/boot/dts/msm8974.dtsi
+++ b/arch/arm/boot/dts/msm8974.dtsi
@@ -154,7 +154,6 @@
 		qcom,hsusb-otg-mode = <1>;
 		qcom,hsusb-otg-otg-control = <1>;
 		qcom,hsusb-otg-disable-reset;
-		qcom,hsusb-otg-pnoc-errata-fix;
 
 		qcom,msm-bus,name = "usb2";
 		qcom,msm-bus,num-cases = <2>;