ARM: tegra: Add resets & has-utmi-pad-registers flag to all USB PHYs

Add new properties to all of the Tegra PHYs that are now required
according to the binding.

In order to stay compatible with old device trees, the USB drivers
will still function without these reset properties but with the old,
potentially buggy behaviour.

Signed-off-by: Tuomas Tynkkynen <ttynkkynen@nvidia.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi
index fdc559ab2db3674b10841e38caff0cf2b8512d60..7da20ca633ddf3cf8619b02dba6f01f2abf5ea3a 100644 (file)
--- a/arch/arm/boot/dts/tegra114.dtsi
+++ b/arch/arm/boot/dts/tegra114.dtsi
@@ -657,6 +657,8 @@
                         <&tegra_car TEGRA114_CLK_PLL_U>,
                         <&tegra_car TEGRA114_CLK_USBD>;
                clock-names = "reg", "pll_u", "utmi-pads";
+               resets = <&tegra_car 22>, <&tegra_car 22>;
+               reset-names = "usb", "utmi-pads";
                nvidia,hssync-start-delay = <0>;
                nvidia,idle-wait-delay = <17>;
                nvidia,elastic-limit = <16>;
@@ -667,6 +669,7 @@
                nvidia,hssquelch-level = <2>;
                nvidia,hsdiscon-level = <5>;
                nvidia,xcvr-hsslew = <12>;
+               nvidia,has-utmi-pad-registers;
                status = "disabled";
        };
 
@@ -690,6 +693,8 @@
                         <&tegra_car TEGRA114_CLK_PLL_U>,
                         <&tegra_car TEGRA114_CLK_USBD>;
                clock-names = "reg", "pll_u", "utmi-pads";
+               resets = <&tegra_car 59>, <&tegra_car 22>;
+               reset-names = "usb", "utmi-pads";
                nvidia,hssync-start-delay = <0>;
                nvidia,idle-wait-delay = <17>;
                nvidia,elastic-limit = <16>;

diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi
index 6e6bc4e8185c3e836b8a09b0ce5c90f135f9f118..aa8753a7c211df372a0d17dcfd50bbab8f35730c 100644 (file)
--- a/arch/arm/boot/dts/tegra124.dtsi
+++ b/arch/arm/boot/dts/tegra124.dtsi
@@ -613,6 +613,8 @@
                         <&tegra_car TEGRA124_CLK_PLL_U>,
                         <&tegra_car TEGRA124_CLK_USBD>;
                clock-names = "reg", "pll_u", "utmi-pads";
+               resets = <&tegra_car 59>, <&tegra_car 22>;
+               reset-names = "usb", "utmi-pads";
                nvidia,hssync-start-delay = <0>;
                nvidia,idle-wait-delay = <17>;
                nvidia,elastic-limit = <16>;
@@ -647,6 +649,8 @@
                         <&tegra_car TEGRA124_CLK_PLL_U>,
                         <&tegra_car TEGRA124_CLK_USBD>;
                clock-names = "reg", "pll_u", "utmi-pads";
+               resets = <&tegra_car 22>, <&tegra_car 22>;
+               reset-names = "usb", "utmi-pads";
                nvidia,hssync-start-delay = <0>;
                nvidia,idle-wait-delay = <17>;
                nvidia,elastic-limit = <16>;
@@ -657,6 +661,7 @@
                nvidia,hssquelch-level = <2>;
                nvidia,hsdiscon-level = <5>;
                nvidia,xcvr-hsslew = <12>;
+               nvidia,has-utmi-pad-registers;
                status = "disabled";
        };
 
@@ -681,6 +686,8 @@
                         <&tegra_car TEGRA124_CLK_PLL_U>,
                         <&tegra_car TEGRA124_CLK_USBD>;
                clock-names = "reg", "pll_u", "utmi-pads";
+               resets = <&tegra_car 58>, <&tegra_car 22>;
+               reset-names = "usb", "utmi-pads";
                nvidia,hssync-start-delay = <0>;
                nvidia,idle-wait-delay = <17>;
                nvidia,elastic-limit = <16>;

diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi
index a7ddf70df50b428012b1d6fdb8dd5b018f1b73a8..935df8906f251300bb71f4829bfa9c4b5e421fa0 100644 (file)
--- a/arch/arm/boot/dts/tegra20.dtsi
+++ b/arch/arm/boot/dts/tegra20.dtsi
@@ -630,6 +630,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>;
@@ -638,6 +640,7 @@
                nvidia,xcvr-setup = <9>;
                nvidia,xcvr-lsfslew = <1>;
                nvidia,xcvr-lsrslew = <1>;
+               nvidia,has-utmi-pad-registers;
                status = "disabled";
        };
 
@@ -661,6 +664,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";
        };
 
@@ -685,6 +690,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>;

diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi
index dec4fc8239017e3ad78fd94a4440265986494527..54805ce5efe094dbf28921d4f52374ff57bdf2c4 100644 (file)
--- a/arch/arm/boot/dts/tegra30.dtsi
+++ b/arch/arm/boot/dts/tegra30.dtsi
@@ -775,6 +775,8 @@
                         <&tegra_car TEGRA30_CLK_PLL_U>,
                         <&tegra_car TEGRA30_CLK_USBD>;
                clock-names = "reg", "pll_u", "utmi-pads";
+               resets = <&tegra_car 22>, <&tegra_car 22>;
+               reset-names = "usb", "utmi-pads";
                nvidia,hssync-start-delay = <9>;
                nvidia,idle-wait-delay = <17>;
                nvidia,elastic-limit = <16>;
@@ -786,6 +788,7 @@
                nvidia,xcvr-hsslew = <32>;
                nvidia,hssquelch-level = <2>;
                nvidia,hsdiscon-level = <5>;
+               nvidia,has-utmi-pad-registers;
                status = "disabled";
        };
 
@@ -809,6 +812,8 @@
                         <&tegra_car TEGRA30_CLK_PLL_U>,
                         <&tegra_car TEGRA30_CLK_USBD>;
                clock-names = "reg", "pll_u", "utmi-pads";
+               resets = <&tegra_car 58>, <&tegra_car 22>;
+               reset-names = "usb", "utmi-pads";
                nvidia,hssync-start-delay = <9>;
                nvidia,idle-wait-delay = <17>;
                nvidia,elastic-limit = <16>;
@@ -843,6 +848,8 @@
                         <&tegra_car TEGRA30_CLK_PLL_U>,
                         <&tegra_car TEGRA30_CLK_USBD>;
                clock-names = "reg", "pll_u", "utmi-pads";
+               resets = <&tegra_car 59>, <&tegra_car 22>;
+               reset-names = "usb", "utmi-pads";
                nvidia,hssync-start-delay = <0>;
                nvidia,idle-wait-delay = <17>;
                nvidia,elastic-limit = <16>;