ARM: tegra: Add new properties to USB PHY device-tree nodes

Add new properties to USB PHYs needed for enabling USB OTG mode.

Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi
index fb99b3e971c3b1b4bdd8e24d55b686d8d77ac6d2..b391c7940b8f2ba48ea1c0e25592465cada535c4 100644 (file)
--- a/arch/arm/boot/dts/tegra114.dtsi
+++ b/arch/arm/boot/dts/tegra114.dtsi
@@ -706,6 +706,7 @@
                compatible = "nvidia,tegra114-usb-phy", "nvidia,tegra30-usb-phy";
                reg = <0x7d000000 0x4000>,
                      <0x7d000000 0x4000>;
+               interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
                phy_type = "utmi";
                clocks = <&tegra_car TEGRA114_CLK_USBD>,
                         <&tegra_car TEGRA114_CLK_PLL_U>,
@@ -725,6 +726,7 @@
                nvidia,hsdiscon-level = <5>;
                nvidia,xcvr-hsslew = <12>;
                nvidia,has-utmi-pad-registers;
+               nvidia,pmc = <&tegra_pmc 0>;
                status = "disabled";
        };
 
@@ -744,6 +746,7 @@
                compatible = "nvidia,tegra114-usb-phy", "nvidia,tegra30-usb-phy";
                reg = <0x7d008000 0x4000>,
                      <0x7d000000 0x4000>;
+               interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
                phy_type = "utmi";
                clocks = <&tegra_car TEGRA114_CLK_USB3>,
                         <&tegra_car TEGRA114_CLK_PLL_U>,
@@ -762,6 +765,7 @@
                nvidia,hssquelch-level = <2>;
                nvidia,hsdiscon-level = <5>;
                nvidia,xcvr-hsslew = <12>;
+               nvidia,pmc = <&tegra_pmc 2>;
                status = "disabled";
        };
 

diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi
index 8b38f123f55428bbe26bc1742076620eed51e51a..ee28bb2b01ba0a983f6fdc80b6af9d7f1ba3065c 100644 (file)
--- a/arch/arm/boot/dts/tegra124.dtsi
+++ b/arch/arm/boot/dts/tegra124.dtsi
@@ -1094,6 +1094,7 @@
                compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";
                reg = <0x0 0x7d000000 0x0 0x4000>,
                      <0x0 0x7d000000 0x0 0x4000>;
+               interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
                phy_type = "utmi";
                clocks = <&tegra_car TEGRA124_CLK_USBD>,
                         <&tegra_car TEGRA124_CLK_PLL_U>,
@@ -1113,6 +1114,7 @@
                nvidia,hsdiscon-level = <5>;
                nvidia,xcvr-hsslew = <12>;
                nvidia,has-utmi-pad-registers;
+               nvidia,pmc = <&tegra_pmc 0>;
                status = "disabled";
        };
 
@@ -1132,6 +1134,7 @@
                compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";
                reg = <0x0 0x7d004000 0x0 0x4000>,
                      <0x0 0x7d000000 0x0 0x4000>;
+               interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
                phy_type = "utmi";
                clocks = <&tegra_car TEGRA124_CLK_USB2>,
                         <&tegra_car TEGRA124_CLK_PLL_U>,
@@ -1150,6 +1153,7 @@
                nvidia,hssquelch-level = <2>;
                nvidia,hsdiscon-level = <5>;
                nvidia,xcvr-hsslew = <12>;
+               nvidia,pmc = <&tegra_pmc 1>;
                status = "disabled";
        };
 
@@ -1169,6 +1173,7 @@
                compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";
                reg = <0x0 0x7d008000 0x0 0x4000>,
                      <0x0 0x7d000000 0x0 0x4000>;
+               interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
                phy_type = "utmi";
                clocks = <&tegra_car TEGRA124_CLK_USB3>,
                         <&tegra_car TEGRA124_CLK_PLL_U>,
@@ -1187,6 +1192,7 @@
                nvidia,hssquelch-level = <2>;
                nvidia,hsdiscon-level = <5>;
                nvidia,xcvr-hsslew = <12>;
+               nvidia,pmc = <&tegra_pmc 2>;
                status = "disabled";
        };
 

diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi
index 6ce498178105499f953528fbf4ee155d4acdb17b..afd817e356c00dbab83455df0caa10b854420a44 100644 (file)
--- a/arch/arm/boot/dts/tegra20.dtsi
+++ b/arch/arm/boot/dts/tegra20.dtsi
@@ -761,6 +761,7 @@
                compatible = "nvidia,tegra20-usb-phy";
                reg = <0xc5000000 0x4000>,
                      <0xc5000000 0x4000>;
+               interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
                phy_type = "utmi";
                clocks = <&tegra_car TEGRA20_CLK_USBD>,
                         <&tegra_car TEGRA20_CLK_PLL_U>,
@@ -779,6 +780,7 @@
                nvidia,xcvr-lsfslew = <1>;
                nvidia,xcvr-lsrslew = <1>;
                nvidia,has-utmi-pad-registers;
+               nvidia,pmc = <&tegra_pmc 0>;
                status = "disabled";
        };
 
@@ -797,6 +799,7 @@
        phy2: usb-phy@c5004000 {
                compatible = "nvidia,tegra20-usb-phy";
                reg = <0xc5004000 0x4000>;
+               interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
                phy_type = "ulpi";
                clocks = <&tegra_car TEGRA20_CLK_USB2>,
                         <&tegra_car TEGRA20_CLK_PLL_U>,
@@ -805,6 +808,7 @@
                resets = <&tegra_car 58>, <&tegra_car 22>;
                reset-names = "usb", "utmi-pads";
                #phy-cells = <0>;
+               nvidia,pmc = <&tegra_pmc 1>;
                status = "disabled";
        };
 
@@ -824,6 +828,7 @@
                compatible = "nvidia,tegra20-usb-phy";
                reg = <0xc5008000 0x4000>,
                      <0xc5000000 0x4000>;
+               interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
                phy_type = "utmi";
                clocks = <&tegra_car TEGRA20_CLK_USB3>,
                         <&tegra_car TEGRA20_CLK_PLL_U>,
@@ -840,6 +845,7 @@
                nvidia,xcvr-setup = <9>;
                nvidia,xcvr-lsfslew = <2>;
                nvidia,xcvr-lsrslew = <2>;
+               nvidia,pmc = <&tegra_pmc 2>;
                status = "disabled";
        };
 

diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi
index eaf4951d9ff8e3fd122eaf095ec998a9320220ae..a3c70cd01fde3f0c55d4271bf1999b1b63b4cf0e 100644 (file)
--- a/arch/arm/boot/dts/tegra30.dtsi
+++ b/arch/arm/boot/dts/tegra30.dtsi
@@ -974,6 +974,7 @@
                compatible = "nvidia,tegra30-usb-phy";
                reg = <0x7d000000 0x4000>,
                      <0x7d000000 0x4000>;
+               interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
                phy_type = "utmi";
                clocks = <&tegra_car TEGRA30_CLK_USBD>,
                         <&tegra_car TEGRA30_CLK_PLL_U>,
@@ -994,6 +995,7 @@
                nvidia,hssquelch-level = <2>;
                nvidia,hsdiscon-level = <5>;
                nvidia,has-utmi-pad-registers;
+               nvidia,pmc = <&tegra_pmc 0>;
                status = "disabled";
        };
 
@@ -1013,6 +1015,7 @@
                compatible = "nvidia,tegra30-usb-phy";
                reg = <0x7d004000 0x4000>,
                      <0x7d000000 0x4000>;
+               interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
                phy_type = "utmi";
                clocks = <&tegra_car TEGRA30_CLK_USB2>,
                         <&tegra_car TEGRA30_CLK_PLL_U>,
@@ -1032,6 +1035,7 @@
                nvidia,xcvr-hsslew = <32>;
                nvidia,hssquelch-level = <2>;
                nvidia,hsdiscon-level = <5>;
+               nvidia,pmc = <&tegra_pmc 2>;
                status = "disabled";
        };
 
@@ -1051,6 +1055,7 @@
                compatible = "nvidia,tegra30-usb-phy";
                reg = <0x7d008000 0x4000>,
                      <0x7d000000 0x4000>;
+               interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
                phy_type = "utmi";
                clocks = <&tegra_car TEGRA30_CLK_USB3>,
                         <&tegra_car TEGRA30_CLK_PLL_U>,
@@ -1070,6 +1075,7 @@
                nvidia,xcvr-hsslew = <32>;
                nvidia,hssquelch-level = <2>;
                nvidia,hsdiscon-level = <5>;
+               nvidia,pmc = <&tegra_pmc 1>;
                status = "disabled";
        };