commit 6f60d06f5230a5f26a3356a01df4b8b93a59ed65
author Linux Build Service Account <lnxbuild@localhost> Fri Oct 26 03:03:03 2012 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Oct 26 03:03:02 2012 -0700
tree a3edc6bb44b07ae3edeaad3cda9fca68affac317
parent 6ad49566813178a5b6df03d616c99305c75e5869
parent a3de1ccce252529b60f3a53e0194c42b3fbb8c55

Merge "arm/dt: 8974: Set otg_capability flag to get external VBUS notifications"

arch/arm/boot/dts/msm8974-mtp.dts

diff --git a/arch/arm/boot/dts/msm8974-mtp.dts b/arch/arm/boot/dts/msm8974-mtp.dts
index b63595b..c5fabab 100644
--- a/arch/arm/boot/dts/msm8974-mtp.dts
+++ b/arch/arm/boot/dts/msm8974-mtp.dts
@@ -177,6 +177,10 @@
 	qcom,hsusb-otg-otg-control = <2>;
 };
 
+&usb3 {
+	qcom,dwc-usb3-msm-otg-capability;
+};
+
 &pm8941_chg {
 	status = "ok";
 

arch/arm/boot/dts/msm8974.dtsi

diff --git a/arch/arm/boot/dts/msm8974.dtsi b/arch/arm/boot/dts/msm8974.dtsi
index f781eee..00b69ea 100644
--- a/arch/arm/boot/dts/msm8974.dtsi
+++ b/arch/arm/boot/dts/msm8974.dtsi
@@ -630,7 +630,7 @@
 		l2_hfpll_b-supply = <&pm8941_l12_ao>;
 	};
 
-	qcom,ssusb@f9200000 {
+	usb3: qcom,ssusb@f9200000 {
 		compatible = "qcom,dwc-usb3-msm";
 		reg = <0xf9200000 0xfc000>,
 			  <0xfd4ab000 0x4>;