Merge tag 'cleanup-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[cascardo/linux.git] / arch / arm / boot / dts / tegra20.dtsi

diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi
index 243d84c..1908f69 100644 (file)
--- a/arch/arm/boot/dts/tegra20.dtsi
+++ b/arch/arm/boot/dts/tegra20.dtsi
@@ -645,6 +645,8 @@
                         <&tegra_car TEGRA20_CLK_CLK_M>,
                         <&tegra_car TEGRA20_CLK_USBD>;
                clock-names = "reg", "pll_u", "timer", "utmi-pads";
+               resets = <&tegra_car 22>, <&tegra_car 22>;
+               reset-names = "usb", "utmi-pads";
                nvidia,has-legacy-mode;
                nvidia,hssync-start-delay = <9>;
                nvidia,idle-wait-delay = <17>;
@@ -653,6 +655,7 @@
                nvidia,xcvr-setup = <9>;
                nvidia,xcvr-lsfslew = <1>;
                nvidia,xcvr-lsrslew = <1>;
+               nvidia,has-utmi-pad-registers;
                status = "disabled";
        };
 
@@ -676,6 +679,8 @@
                         <&tegra_car TEGRA20_CLK_PLL_U>,
                         <&tegra_car TEGRA20_CLK_CDEV2>;
                clock-names = "reg", "pll_u", "ulpi-link";
+               resets = <&tegra_car 58>, <&tegra_car 22>;
+               reset-names = "usb", "utmi-pads";
                status = "disabled";
        };
 
@@ -700,6 +705,8 @@
                         <&tegra_car TEGRA20_CLK_CLK_M>,
                         <&tegra_car TEGRA20_CLK_USBD>;
                clock-names = "reg", "pll_u", "timer", "utmi-pads";
+               resets = <&tegra_car 59>, <&tegra_car 22>;
+               reset-names = "usb", "utmi-pads";
                nvidia,hssync-start-delay = <9>;
                nvidia,idle-wait-delay = <17>;
                nvidia,elastic-limit = <16>;