ARM: dts: dra7-evm: Add extcon to USB2 port

Both ports on the dra7-evm and related boards can be used
as dual-role ports. Although we don't enable dual-role mode
for USB2 port let's add the necessary extcon bits to it.

Move the common portion of extcon_usb2 into dra7-evm-common.dtsi

Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/boot/dts/dra7-evm-common.dtsi b/arch/arm/boot/dts/dra7-evm-common.dtsi
index 33230c8..7e18147 100644 (file)
--- a/arch/arm/boot/dts/dra7-evm-common.dtsi
+++ b/arch/arm/boot/dts/dra7-evm-common.dtsi
@@ -20,6 +20,11 @@
                id-gpio = <&pcf_gpio_21 1 GPIO_ACTIVE_HIGH>;
        };
 
+       extcon_usb2: extcon_usb2 {
+               compatible = "linux,extcon-usb-gpio";
+               id-gpio = <&pcf_gpio_21 2 GPIO_ACTIVE_HIGH>;
+       };
+
        sound0: sound0 {
                compatible = "simple-audio-card";
                simple-audio-card,name = "DRA7xx-EVM";
@@ -198,8 +203,13 @@
        extcon = <&extcon_usb1>;
 };
 
+&omap_dwc3_2 {
+       extcon = <&extcon_usb2>;
+};
+
 &usb2 {
        dr_mode = "host";
+       extcon = <&extcon_usb2>;
 };
 
 &atl {

diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
index 0894593..6ed5f91 100644 (file)
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -106,11 +106,6 @@
                enable-active-high;
        };
 
-       extcon_usb2: extcon_usb2 {
-               compatible = "linux,extcon-usb-gpio";
-               id-gpio = <&pcf_gpio_21 2 GPIO_ACTIVE_HIGH>;
-       };
-
        vtt_fixed: fixedregulator-vtt {
                compatible = "regulator-fixed";
                regulator-name = "vtt_fixed";
@@ -406,10 +401,6 @@
        vdd-supply = <&smps123_reg>;
 };
 
-&omap_dwc3_2 {
-       extcon = <&extcon_usb2>;
-};
-
 &elm {
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/dra72-evm-common.dtsi b/arch/arm/boot/dts/dra72-evm-common.dtsi
index df174f5..e297b92 100644 (file)
--- a/arch/arm/boot/dts/dra72-evm-common.dtsi
+++ b/arch/arm/boot/dts/dra72-evm-common.dtsi
@@ -391,6 +391,7 @@
 
 &usb2 {
        dr_mode = "host";
+       extcon = <&extcon_usb2>;
 };
 
 &mmc1 {