Merge tag 'tegra-for-3.11-deps-for-usb' into next

ARM: tegra: DT-related fixes needed by the USB tree

The Tegra USB bindings were in bad shape. The patches in this branch
fix the binding definitions, and make all the necessary additions to
the DT files. Stale nodes/properties will be removed early in 3.12
once the USB driver has been updated for the new binding.

These changes are needed in both the USB tree, to allow the driver to
be updated to handle them, and the Tegra tree, so that various tree-
wide DT changes (e.g. conversion of IRQ/GPIO/clock constants to defines)
can be applied on top of them.

* tag 'tegra-for-3.11-deps-for-usb':
  ARM: tegra: update device trees for USB binding rework
  ARM: tegra: modify ULPI reset GPIO properties
  ARM: tegra: finalize USB EHCI and PHY bindings

Signed-of-by: Felipe Balbi <balbi@ti.com>

10 files changed, 163 insertions, 29 deletions

diff --git a/arch/arm/boot/dts/tegra20-colibri-512.dtsi b/arch/arm/boot/dts/tegra20-colibri-512.dtsi
index a573b94b7c93..c12af78e479c 100644
--- a/arch/arm/boot/dts/tegra20-colibri-512.dtsi
+++ b/arch/arm/boot/dts/tegra20-colibri-512.dtsi
@@ -449,7 +449,11 @@
 
         usb@c5004000 {
                 status = "okay";
-                nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */
+                nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */
+        };
+
+        usb-phy@c5004000 {
+                nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */
         };
 
         sdhci@c8000600 {
diff --git a/arch/arm/boot/dts/tegra20-harmony.dts b/arch/arm/boot/dts/tegra20-harmony.dts
index e7d5de4e00b9..ec5293758753 100644
--- a/arch/arm/boot/dts/tegra20-harmony.dts
+++ b/arch/arm/boot/dts/tegra20-harmony.dts
@@ -428,17 +428,26 @@
                 status = "okay";
         };
 
+        usb-phy@c5000000 {
+                status = "okay";
+        };
+
         usb@c5004000 {
                 status = "okay";
-                nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */
+                nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */
+        };
+
+        usb-phy@c5004000 {
+                status = "okay";
+                nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */
         };
 
         usb@c5008000 {
                 status = "okay";
         };
 
-        usb-phy@c5004400 {
-                nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */
+        usb-phy@c5008000 {
+                status = "okay";
         };
 
         sdhci@c8000200 {
diff --git a/arch/arm/boot/dts/tegra20-iris-512.dts b/arch/arm/boot/dts/tegra20-iris-512.dts
index 52f1103907d7..9f64f7086881 100644
--- a/arch/arm/boot/dts/tegra20-iris-512.dts
+++ b/arch/arm/boot/dts/tegra20-iris-512.dts
@@ -38,13 +38,20 @@
 
         usb@c5000000 {
                 status = "okay";
-                dr_mode = "otg";
+        };
+
+        usb-phy@c5000000 {
+                status = "okay";
         };
 
         usb@c5008000 {
                 status = "okay";
         };
 
+        usb-phy@c5008000 {
+                status = "okay";
+        };
+
         serial@70006000 {
                 status = "okay";
         };
diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts
index e3e0c9977df4..1c17ffaff1ad 100644
--- a/arch/arm/boot/dts/tegra20-paz00.dts
+++ b/arch/arm/boot/dts/tegra20-paz00.dts
@@ -427,17 +427,26 @@
                 status = "okay";
         };
 
+        usb-phy@c5000000 {
+                status = "okay";
+        };
+
         usb@c5004000 {
                 status = "okay";
-                nvidia,phy-reset-gpio = <&gpio 168 0>; /* gpio PV0 */
+                nvidia,phy-reset-gpio = <&gpio 168 1>; /* gpio PV0, active low */
+        };
+
+        usb-phy@c5004000 {
+                status = "okay";
+                nvidia,phy-reset-gpio = <&gpio 168 1>; /* gpio PV0, active low */
         };
 
         usb@c5008000 {
                 status = "okay";
         };
 
-        usb-phy@c5004400 {
-                nvidia,phy-reset-gpio = <&gpio 168 0>; /* gpio PV0 */
+        usb-phy@c5008000 {
+                status = "okay";
         };
 
         sdhci@c8000000 {
diff --git a/arch/arm/boot/dts/tegra20-seaboard.dts b/arch/arm/boot/dts/tegra20-seaboard.dts
index cee4c34010fe..009dafecf88b 100644
--- a/arch/arm/boot/dts/tegra20-seaboard.dts
+++ b/arch/arm/boot/dts/tegra20-seaboard.dts
@@ -569,17 +569,28 @@
                 dr_mode = "otg";
         };
 
+        usb-phy@c5000000 {
+                status = "okay";
+                vbus-supply = <&vbus_reg>;
+                dr_mode = "otg";
+        };
+
         usb@c5004000 {
                 status = "okay";
-                nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */
+                nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */
+        };
+
+        usb-phy@c5004000 {
+                status = "okay";
+                nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */
         };
 
         usb@c5008000 {
                 status = "okay";
         };
 
-        usb-phy@c5004400 {
-                nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */
+        usb-phy@c5008000 {
+                status = "okay";
         };
 
         sdhci@c8000000 {
@@ -807,6 +818,15 @@
                         gpio = <&pmic 1 0>;
                         enable-active-high;
                 };
+
+                vbus_reg: regulator@3 {
+                        compatible = "regulator-fixed";
+                        reg = <3>;
+                        regulator-name = "vdd_vbus_wup1";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                        gpio = <&gpio 24 0>; /* PD0 */
+                };
         };
 
         sound {
diff --git a/arch/arm/boot/dts/tegra20-tamonten.dtsi b/arch/arm/boot/dts/tegra20-tamonten.dtsi
index 50b3ec16b93a..fc2f7d6e70b2 100644
--- a/arch/arm/boot/dts/tegra20-tamonten.dtsi
+++ b/arch/arm/boot/dts/tegra20-tamonten.dtsi
@@ -470,6 +470,10 @@
                 status = "okay";
         };
 
+        usb-phy@c5008000 {
+                status = "okay";
+        };
+
         sdhci@c8000600 {
                 cd-gpios = <&gpio 58 1>; /* gpio PH2 */
                 wp-gpios = <&gpio 59 0>; /* gpio PH3 */
diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts
index 9cc78a15d739..0e65c00ec732 100644
--- a/arch/arm/boot/dts/tegra20-trimslice.dts
+++ b/arch/arm/boot/dts/tegra20-trimslice.dts
@@ -314,17 +314,27 @@
                 nvidia,vbus-gpio = <&gpio 170 0>; /* gpio PV2 */
         };
 
+        usb-phy@c5000000 {
+                status = "okay";
+                vbus-supply = <&vbus_reg>;
+        };
+
         usb@c5004000 {
                 status = "okay";
-                nvidia,phy-reset-gpio = <&gpio 168 0>; /* gpio PV0 */
+                nvidia,phy-reset-gpio = <&gpio 168 1>; /* gpio PV0, active low */
+        };
+
+        usb-phy@c5004000 {
+                status = "okay";
+                nvidia,phy-reset-gpio = <&gpio 168 1>; /* gpio PV0, active low */
         };
 
         usb@c5008000 {
                 status = "okay";
         };
 
-        usb-phy@c5004400 {
-                nvidia,phy-reset-gpio = <&gpio 168 0>; /* gpio PV0 */
+        usb-phy@c5008000 {
+                status = "okay";
         };
 
         sdhci@c8000000 {
@@ -390,6 +400,15 @@
                         regulator-max-microvolt = <1800000>;
                         regulator-always-on;
                 };
+
+                vbus_reg: regulator@2 {
+                        compatible = "regulator-fixed";
+                        reg = <2>;
+                        regulator-name = "usb1_vbus";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                        gpio = <&gpio 170 0>; /* PV2 */
+                };
         };
 
         sound {
diff --git a/arch/arm/boot/dts/tegra20-ventana.dts b/arch/arm/boot/dts/tegra20-ventana.dts
index dd38f1f03834..e00f89e645f9 100644
--- a/arch/arm/boot/dts/tegra20-ventana.dts
+++ b/arch/arm/boot/dts/tegra20-ventana.dts
@@ -505,17 +505,26 @@
                 status = "okay";
         };
 
+        usb-phy@c5000000 {
+                status = "okay";
+        };
+
         usb@c5004000 {
                 status = "okay";
-                nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */
+                nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */
+        };
+
+        usb-phy@c5004000 {
+                status = "okay";
+                nvidia,phy-reset-gpio = <&gpio 169 1>; /* gpio PV1, active low */
         };
 
         usb@c5008000 {
                 status = "okay";
         };
 
-        usb-phy@c5004400 {
-                nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */
+        usb-phy@c5008000 {
+                status = "okay";
         };
 
         sdhci@c8000000 {
diff --git a/arch/arm/boot/dts/tegra20-whistler.dts b/arch/arm/boot/dts/tegra20-whistler.dts
index d2567f83aaff..3c24c9b92b44 100644
--- a/arch/arm/boot/dts/tegra20-whistler.dts
+++ b/arch/arm/boot/dts/tegra20-whistler.dts
@@ -511,11 +511,21 @@
                 nvidia,vbus-gpio = <&tca6416 0 0>; /* GPIO_PMU0 */
         };
 
+        usb-phy@c5000000 {
+                status = "okay";
+                vbus-supply = <&vbus1_reg>;
+        };
+
         usb@c5008000 {
                 status = "okay";
                 nvidia,vbus-gpio = <&tca6416 1 0>; /* GPIO_PMU1 */
         };
 
+        usb-phy@c5008000 {
+                status = "okay";
+                vbus-supply = <&vbus3_reg>;
+        };
+
         sdhci@c8000400 {
                 status = "okay";
                 cd-gpios = <&gpio 69 1>; /* gpio PI5 */
@@ -568,6 +578,24 @@
                         regulator-max-microvolt = <5000000>;
                         regulator-always-on;
                 };
+
+                vbus1_reg: regulator@2 {
+                        compatible = "regulator-fixed";
+                        reg = <2>;
+                        regulator-name = "vbus1";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                        gpio = <&tca6416 0 0>; /* GPIO_PMU0 */
+                };
+
+                vbus3_reg: regulator@3 {
+                        compatible = "regulator-fixed";
+                        reg = <3>;
+                        regulator-name = "vbus3";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                        gpio = <&tca6416 1 0>; /* GPIO_PMU1 */
+                };
         };
 
         sound {
diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi
index 56a91106041b..96d6d8a3aa72 100644
--- a/arch/arm/boot/dts/tegra20.dtsi
+++ b/arch/arm/boot/dts/tegra20.dtsi
@@ -455,13 +455,24 @@
                 status = "disabled";
         };
 
-        phy1: usb-phy@c5000400 {
+        phy1: usb-phy@c5000000 {
                 compatible = "nvidia,tegra20-usb-phy";
-                reg = <0xc5000400 0x3c00>;
+                reg = <0xc5000000 0x4000 0xc5000000 0x4000>;
                 phy_type = "utmi";
+                clocks = <&tegra_car 22>,
+                         <&tegra_car 127>,
+                         <&tegra_car 106>,
+                         <&tegra_car 22>;
+                clock-names = "reg", "pll_u", "timer", "utmi-pads";
                 nvidia,has-legacy-mode;
-                clocks = <&tegra_car 22>, <&tegra_car 127>;
-                clock-names = "phy", "pll_u";
+                hssync_start_delay = <9>;
+                idle_wait_delay = <17>;
+                elastic_limit = <16>;
+                term_range_adj = <6>;
+                xcvr_setup = <9>;
+                xcvr_lsfslew = <1>;
+                xcvr_lsrslew = <1>;
+                status = "disabled";
         };
 
         usb@c5004000 {
@@ -474,12 +485,15 @@
                 status = "disabled";
         };
 
-        phy2: usb-phy@c5004400 {
+        phy2: usb-phy@c5004000 {
                 compatible = "nvidia,tegra20-usb-phy";
-                reg = <0xc5004400 0x3c00>;
+                reg = <0xc5004000 0x4000>;
                 phy_type = "ulpi";
-                clocks = <&tegra_car 93>, <&tegra_car 127>;
-                clock-names = "phy", "pll_u";
+                clocks = <&tegra_car 58>,
+                         <&tegra_car 127>,
+                         <&tegra_car 93>;
+                clock-names = "reg", "pll_u", "ulpi-link";
+                status = "disabled";
         };
 
         usb@c5008000 {
@@ -492,12 +506,23 @@
                 status = "disabled";
         };
 
-        phy3: usb-phy@c5008400 {
+        phy3: usb-phy@c5008000 {
                 compatible = "nvidia,tegra20-usb-phy";
-                reg = <0xc5008400 0x3c00>;
+                reg = <0xc5008000 0x4000 0xc5000000 0x4000>;
                 phy_type = "utmi";
-                clocks = <&tegra_car 22>, <&tegra_car 127>;
-                clock-names = "phy", "pll_u";
+                clocks = <&tegra_car 59>,
+                         <&tegra_car 127>,
+                         <&tegra_car 106>,
+                         <&tegra_car 22>;
+                clock-names = "reg", "pll_u", "timer", "utmi-pads";
+                hssync_start_delay = <9>;
+                idle_wait_delay = <17>;
+                elastic_limit = <16>;
+                term_range_adj = <6>;
+                xcvr_setup = <9>;
+                xcvr_lsfslew = <2>;
+                xcvr_lsrslew = <2>;
+                status = "disabled";
         };
 
         sdhci@c8000000 {