From aa356d1e4e144c26b98ead3e78a02ffa3790ac61 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Mon, 19 Dec 2016 15:38:07 +0100 Subject: colibri_t20: fix ulpi reset polarity Fix ULPI reset polarity which caused a hard hang on Colibri T20 upon attempting to start the USB subsystem: This fixes my late commit d5a24d8b53d350364bd429b7104ec369b817e4b8 (colibri_t20: fix usb operation and controller order) inadvertently having overwritten Stephen's previous commit 2f6a7e8ce5df8b99d84bfd486c6f99d92322ce04 (ARM: tegra: fix USB ULPI PHY reset signal inversion confusion). While at it also fix comment about on-module USB port. Signed-off-by: Marcel Ziswiler Signed-off-by: Tom Warren (cherry picked from commit 3f33bd299fd438a04d37c3c25af1ab02a9b0d2f9) --- arch/arm/dts/tegra20-colibri.dts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'arch') diff --git a/arch/arm/dts/tegra20-colibri.dts b/arch/arm/dts/tegra20-colibri.dts index 89adfb6041..3c10dd6630 100644 --- a/arch/arm/dts/tegra20-colibri.dts +++ b/arch/arm/dts/tegra20-colibri.dts @@ -16,7 +16,7 @@ i2c2 = "/i2c@7000c400"; mmc0 = "/sdhci@c8000600"; usb0 = "/usb@c5000000"; - usb1 = "/usb@c5004000"; /* on-module only, for ASIX */ + usb1 = "/usb@c5004000"; /* On-module only, for ASIX */ usb2 = "/usb@c5008000"; }; @@ -92,8 +92,10 @@ /* EHCI instance 1: ULPI -> USB3340 -> AX88772B */ usb@c5004000 { status = "okay"; + /* ULPI_RESET */ + nvidia,phy-reset-gpio = + <&gpio TEGRA_GPIO(V, 1) GPIO_ACTIVE_LOW>; /* VBUS_LAN */ - nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1) GPIO_ACTIVE_HIGH>; nvidia,vbus-gpio = <&gpio TEGRA_GPIO(BB, 1) GPIO_ACTIVE_HIGH>; }; -- cgit v1.2.3