ARM: tegra: Remove useless usb-ehci compatible string

There's no such thing as a generic USB EHCI controller. The EHCI
controllers found on Tegra SoCs are instantiations that need Tegra-
specific glue to work properly, so drop the generic compatible string
and keep only the Tegra-specific ones.

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 b391c79..546272e 100644 (file)
--- a/arch/arm/boot/dts/tegra114.dtsi
+++ b/arch/arm/boot/dts/tegra114.dtsi
@@ -691,7 +691,7 @@
        };
 
        usb@7d000000 {
-               compatible = "nvidia,tegra114-ehci", "nvidia,tegra30-ehci", "usb-ehci";
+               compatible = "nvidia,tegra114-ehci", "nvidia,tegra30-ehci";
                reg = <0x7d000000 0x4000>;
                interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
                phy_type = "utmi";
@@ -731,7 +731,7 @@
        };
 
        usb@7d008000 {
-               compatible = "nvidia,tegra114-ehci", "nvidia,tegra30-ehci", "usb-ehci";
+               compatible = "nvidia,tegra114-ehci", "nvidia,tegra30-ehci";
                reg = <0x7d008000 0x4000>;
                interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
                phy_type = "utmi";

diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi
index ee28bb2..63a6417 100644 (file)
--- a/arch/arm/boot/dts/tegra124.dtsi
+++ b/arch/arm/boot/dts/tegra124.dtsi
@@ -1079,7 +1079,7 @@
        };
 
        usb@7d000000 {
-               compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci", "usb-ehci";
+               compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci";
                reg = <0x0 0x7d000000 0x0 0x4000>;
                interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
                phy_type = "utmi";
@@ -1119,7 +1119,7 @@
        };
 
        usb@7d004000 {
-               compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci", "usb-ehci";
+               compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci";
                reg = <0x0 0x7d004000 0x0 0x4000>;
                interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
                phy_type = "utmi";
@@ -1158,7 +1158,7 @@
        };
 
        usb@7d008000 {
-               compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci", "usb-ehci";
+               compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci";
                reg = <0x0 0x7d008000 0x0 0x4000>;
                interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
                phy_type = "utmi";

diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi
index afd817e..9508248 100644 (file)
--- a/arch/arm/boot/dts/tegra20.dtsi
+++ b/arch/arm/boot/dts/tegra20.dtsi
@@ -744,11 +744,10 @@
        };
 
        usb@c5000000 {
-               compatible = "nvidia,tegra20-ehci", "usb-ehci";
+               compatible = "nvidia,tegra20-ehci";
                reg = <0xc5000000 0x4000>;
                interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
                phy_type = "utmi";
-               nvidia,has-legacy-mode;
                clocks = <&tegra_car TEGRA20_CLK_USBD>;
                resets = <&tegra_car 22>;
                reset-names = "usb";
@@ -785,7 +784,7 @@
        };
 
        usb@c5004000 {
-               compatible = "nvidia,tegra20-ehci", "usb-ehci";
+               compatible = "nvidia,tegra20-ehci";
                reg = <0xc5004000 0x4000>;
                interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
                phy_type = "ulpi";
@@ -813,7 +812,7 @@
        };
 
        usb@c5008000 {
-               compatible = "nvidia,tegra20-ehci", "usb-ehci";
+               compatible = "nvidia,tegra20-ehci";
                reg = <0xc5008000 0x4000>;
                interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
                phy_type = "utmi";

diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi
index a3c70cd..ae3df73 100644 (file)
--- a/arch/arm/boot/dts/tegra30.dtsi
+++ b/arch/arm/boot/dts/tegra30.dtsi
@@ -958,7 +958,7 @@
        };
 
        usb@7d000000 {
-               compatible = "nvidia,tegra30-ehci", "usb-ehci";
+               compatible = "nvidia,tegra30-ehci";
                reg = <0x7d000000 0x4000>;
                interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
                phy_type = "utmi";
@@ -1000,7 +1000,7 @@
        };
 
        usb@7d004000 {
-               compatible = "nvidia,tegra30-ehci", "usb-ehci";
+               compatible = "nvidia,tegra30-ehci";
                reg = <0x7d004000 0x4000>;
                interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
                phy_type = "utmi";
@@ -1040,7 +1040,7 @@
        };
 
        usb@7d008000 {
-               compatible = "nvidia,tegra30-ehci", "usb-ehci";
+               compatible = "nvidia,tegra30-ehci";
                reg = <0x7d008000 0x4000>;
                interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
                phy_type = "utmi";