[PATCH 0/5] ARM: dts: dra7/am7xx: USB fixes and enhancements

[PATCH 0/5] ARM: dts: dra7/am7xx: USB fixes and enhancements

[Roger Quadros]

Hi Tony,

These are some fixes and enhancements for USB ports on dra7 and am57xx-idk EVMs.
If OK, please queue these for v4.18. Thanks.

Roger Quadros (5):
  ARM: dts: dra7: Disable metastability workaround for USB2
  ARM: dts: am57xx-idk: Enable dual role for USB2 port
  ARM: dts: dra7-evm: Add extcon to USB2 port
  ARM: dts: dra71-evm: Add VBUS GPIO to USB1/USB2 extcon
  ARM: dts: dra76-evm: Add VBUS GPIO to USB1/USB2 extcon

 arch/arm/boot/dts/am571x-idk.dts         |  4 ----
 arch/arm/boot/dts/am572x-idk-common.dtsi |  4 ----
 arch/arm/boot/dts/am57xx-idk-common.dtsi |  7 ++++++-
 arch/arm/boot/dts/dra7-evm-common.dtsi   | 10 ++++++++++
 arch/arm/boot/dts/dra7-evm.dts           |  9 ---------
 arch/arm/boot/dts/dra7.dtsi              |  2 +-
 arch/arm/boot/dts/dra71-evm.dts          |  8 ++++++++
 arch/arm/boot/dts/dra72-evm-common.dtsi  |  1 +
 arch/arm/boot/dts/dra76-evm.dts          |  8 ++++++++
 9 files changed, 34 insertions(+), 19 deletions(-)

-- 
cheers,
-roger

Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

[PATCH 1/5] ARM: dts: dra7: Disable metastability workaround for USB2

[Roger Quadros]

Disable the metastability workaround for USB2. The original
patch disabled the workaround on the wrong USB port.

Fixes: b8c9c6fa2002 ("ARM: dts: dra7: Disable USB metastability workaround for USB2")
Cc: <stable@vger.kernel.org>        [4.16+]
Signed-off-by: Roger Quadros <rogerq@ti.com>
---
 arch/arm/boot/dts/dra7.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index f4ddd86..9cace9f 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -1582,7 +1582,6 @@
 				dr_mode = "otg";
 				snps,dis_u3_susphy_quirk;
 				snps,dis_u2_susphy_quirk;
-				snps,dis_metastability_quirk;
 			};
 		};
 
@@ -1610,6 +1609,7 @@
 				dr_mode = "otg";
 				snps,dis_u3_susphy_quirk;
 				snps,dis_u2_susphy_quirk;
+				snps,dis_metastability_quirk;
 			};
 		};
 
-- 
cheers,
-roger

Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

[PATCH 2/5] ARM: dts: am57xx-idk: Enable dual role for USB2 port

[Roger Quadros]

Dual-role support was added in v4.12. We should be using
it for USB2 port on the am57xx-idk.

Cc: <stable@vger.kernel.org>        [4.16+]
Reported-by: Bin Liu <b-liu@ti.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
---
 arch/arm/boot/dts/am571x-idk.dts         | 4 ----
 arch/arm/boot/dts/am572x-idk-common.dtsi | 4 ----
 arch/arm/boot/dts/am57xx-idk-common.dtsi | 7 ++++++-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/arch/arm/boot/dts/am571x-idk.dts b/arch/arm/boot/dts/am571x-idk.dts
index a255514..86301ae 100644
--- a/arch/arm/boot/dts/am571x-idk.dts
+++ b/arch/arm/boot/dts/am571x-idk.dts
@@ -65,10 +65,6 @@
 	};
 };
 
-&omap_dwc3_2 {
-	extcon = <&extcon_usb2>;
-};
-
 &extcon_usb2 {
 	id-gpio = <&gpio5 7 GPIO_ACTIVE_HIGH>;
 	vbus-gpio = <&gpio7 22 GPIO_ACTIVE_HIGH>;
diff --git a/arch/arm/boot/dts/am572x-idk-common.dtsi b/arch/arm/boot/dts/am572x-idk-common.dtsi
index c6d858b..784639d 100644
--- a/arch/arm/boot/dts/am572x-idk-common.dtsi
+++ b/arch/arm/boot/dts/am572x-idk-common.dtsi
@@ -57,10 +57,6 @@
 	};
 };
 
-&omap_dwc3_2 {
-	extcon = <&extcon_usb2>;
-};
-
 &extcon_usb2 {
 	id-gpio = <&gpio3 16 GPIO_ACTIVE_HIGH>;
 	vbus-gpio = <&gpio3 26 GPIO_ACTIVE_HIGH>;
diff --git a/arch/arm/boot/dts/am57xx-idk-common.dtsi b/arch/arm/boot/dts/am57xx-idk-common.dtsi
index 43cdf52..697cd1a 100644
--- a/arch/arm/boot/dts/am57xx-idk-common.dtsi
+++ b/arch/arm/boot/dts/am57xx-idk-common.dtsi
@@ -406,8 +406,13 @@
 	dr_mode = "host";
 };
 
+&omap_dwc3_2 {
+	extcon = <&extcon_usb2>;
+};
+
 &usb2 {
-	dr_mode = "peripheral";
+	extcon = <&extcon_usb2>;
+	dr_mode = "otg";
 };
 
 &mmc1 {
-- 
cheers,
-roger

Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

[PATCH 3/5] ARM: dts: dra7-evm: Add extcon to USB2 port

[Roger Quadros]

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>
---
 arch/arm/boot/dts/dra7-evm-common.dtsi  | 10 ++++++++++
 arch/arm/boot/dts/dra7-evm.dts          |  9 ---------
 arch/arm/boot/dts/dra72-evm-common.dtsi |  1 +
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/arch/arm/boot/dts/dra7-evm-common.dtsi b/arch/arm/boot/dts/dra7-evm-common.dtsi
index 05a7b1a..425431f 100644
--- 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 f1425b0..272ac773 100644
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -54,11 +54,6 @@
 		regulator-max-microvolt = <1800000>;
 	};
 
-	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";
@@ -338,10 +333,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 e85f560..f2c0777 100644
--- a/arch/arm/boot/dts/dra72-evm-common.dtsi
+++ b/arch/arm/boot/dts/dra72-evm-common.dtsi
@@ -399,6 +399,7 @@
 
 &usb2 {
 	dr_mode = "host";
+	extcon = <&extcon_usb2>;
 };
 
 &mmc1 {
-- 
cheers,
-roger

Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

[PATCH 4/5] ARM: dts: dra71-evm: Add VBUS GPIO to USB1/USB2 extcon

[Roger Quadros]

The board has USB VBUS detection available over GPIO. Plug it to
extcon node of USB1 and USB2 ports.

Signed-off-by: Roger Quadros <rogerq@ti.com>
---
 arch/arm/boot/dts/dra71-evm.dts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/arm/boot/dts/dra71-evm.dts b/arch/arm/boot/dts/dra71-evm.dts
index ebc4bba..c513399 100644
--- a/arch/arm/boot/dts/dra71-evm.dts
+++ b/arch/arm/boot/dts/dra71-evm.dts
@@ -276,3 +276,11 @@
 	/* Supplied by VDA_1V8_PHY */
 	vdda_video-supply = <&lp8732_ldo1_reg>;
 };
+
+&extcon_usb1 {
+	vbus-gpio = <&pcf_lcd 14 GPIO_ACTIVE_HIGH>;
+};
+
+&extcon_usb2 {
+	vbus-gpio = <&pcf_lcd 15 GPIO_ACTIVE_HIGH>;
+};
-- 
cheers,
-roger

Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

[PATCH 5/5] ARM: dts: dra76-evm: Add VBUS GPIO to USB1/USB2 extcon

[Roger Quadros]

The board has USB VBUS detection available over GPIO. Plug it to
extcon node of USB1 and USB2 ports.

Signed-off-by: Roger Quadros <rogerq@ti.com>
---
 arch/arm/boot/dts/dra76-evm.dts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/arm/boot/dts/dra76-evm.dts b/arch/arm/boot/dts/dra76-evm.dts
index 2deb964..bec72ec 100644
--- a/arch/arm/boot/dts/dra76-evm.dts
+++ b/arch/arm/boot/dts/dra76-evm.dts
@@ -404,3 +404,11 @@
 	phys = <&pcie1_phy>, <&pcie2_phy>;
 	phy-names = "pcie-phy0", "pcie-phy1";
 };
+
+&extcon_usb1 {
+	vbus-gpio = <&pcf_lcd 14 GPIO_ACTIVE_HIGH>;
+};
+
+&extcon_usb2 {
+	vbus-gpio = <&pcf_lcd 15 GPIO_ACTIVE_HIGH>;
+};
-- 
cheers,
-roger

Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

Re: [PATCH 0/5] ARM: dts: dra7/am7xx: USB fixes and enhancements

[Roger Quadros]

Hi Tony,

On 29/05/18 12:00, Roger Quadros wrote:
> Hi Tony,
> 
> These are some fixes and enhancements for USB ports on dra7 and am57xx-idk EVMs.
> If OK, please queue these for v4.18. Thanks.
> 

Gentle reminder.
Could you please pick the first patch for 2018-rc, and the rest for -next. Thanks.

> Roger Quadros (5):
>   ARM: dts: dra7: Disable metastability workaround for USB2
>   ARM: dts: am57xx-idk: Enable dual role for USB2 port
>   ARM: dts: dra7-evm: Add extcon to USB2 port
>   ARM: dts: dra71-evm: Add VBUS GPIO to USB1/USB2 extcon
>   ARM: dts: dra76-evm: Add VBUS GPIO to USB1/USB2 extcon
> 
>  arch/arm/boot/dts/am571x-idk.dts         |  4 ----
>  arch/arm/boot/dts/am572x-idk-common.dtsi |  4 ----
>  arch/arm/boot/dts/am57xx-idk-common.dtsi |  7 ++++++-
>  arch/arm/boot/dts/dra7-evm-common.dtsi   | 10 ++++++++++
>  arch/arm/boot/dts/dra7-evm.dts           |  9 ---------
>  arch/arm/boot/dts/dra7.dtsi              |  2 +-
>  arch/arm/boot/dts/dra71-evm.dts          |  8 ++++++++
>  arch/arm/boot/dts/dra72-evm-common.dtsi  |  1 +
>  arch/arm/boot/dts/dra76-evm.dts          |  8 ++++++++
>  9 files changed, 34 insertions(+), 19 deletions(-)
> 

-- 
cheers,
-roger

Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

Re: [PATCH 1/5] ARM: dts: dra7: Disable metastability workaround for USB2

[Tony Lindgren]

* Roger Quadros <rogerq@ti.com> [180529 02:03]:
> Disable the metastability workaround for USB2. The original
> patch disabled the workaround on the wrong USB port.
> 
> Fixes: b8c9c6fa2002 ("ARM: dts: dra7: Disable USB metastability workaround for USB2")
> Cc: <stable@vger.kernel.org>        [4.16+]
> Signed-off-by: Roger Quadros <rogerq@ti.com>


Sorry for the delay, applying this one into omap-for-v4.18/fixes.

Regards,

Tony

> ---
>  arch/arm/boot/dts/dra7.dtsi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
> index f4ddd86..9cace9f 100644
> --- a/arch/arm/boot/dts/dra7.dtsi
> +++ b/arch/arm/boot/dts/dra7.dtsi
> @@ -1582,7 +1582,6 @@
>  				dr_mode = "otg";
>  				snps,dis_u3_susphy_quirk;
>  				snps,dis_u2_susphy_quirk;
> -				snps,dis_metastability_quirk;
>  			};
>  		};
>  
> @@ -1610,6 +1609,7 @@
>  				dr_mode = "otg";
>  				snps,dis_u3_susphy_quirk;
>  				snps,dis_u2_susphy_quirk;
> +				snps,dis_metastability_quirk;
>  			};
>  		};
>  
> -- 
> cheers,
> -roger
> 
> Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
> Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
> 

Re: [PATCH 0/5] ARM: dts: dra7/am7xx: USB fixes and enhancements

[Tony Lindgren]

* Roger Quadros <rogerq@ti.com> [180702 09:00]:
> Hi Tony,
> 
> On 29/05/18 12:00, Roger Quadros wrote:
> > Hi Tony,
> > 
> > These are some fixes and enhancements for USB ports on dra7 and am57xx-idk EVMs.
> > If OK, please queue these for v4.18. Thanks.
> > 
> 
> Gentle reminder.
> Could you please pick the first patch for 2018-rc, and the rest for -next. Thanks.

Applying patches 2 to 5 into omap-for-v4.19/dt thanks.

Tony