Commit 96f4adcd authored by Thierry Reding's avatar Thierry Reding
Browse files

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: default avatarThierry Reding <treding@nvidia.com>
parent d64b5095

arch/arm/boot/dts/tegra114.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -691,7 +691,7 @@ mmc@78000600 { 
	};



	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 @@ phy1: usb-phy@7d000000 { 
	};



	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";

arch/arm/boot/dts/tegra124.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -1079,7 +1079,7 @@ tegra_i2s4: i2s@70301400 { 
	};



	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 @@ phy1: usb-phy@7d000000 { 
	};



	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 @@ phy2: usb-phy@7d004000 { 
	};



	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";

arch/arm/boot/dts/tegra20.dtsi

+3 −4
Original line number Diff line number Diff line
@@ -744,11 +744,10 @@ pci@2,0 { 
	};



	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 @@ phy1: usb-phy@c5000000 { 
	};



	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 @@ phy2: usb-phy@c5004000 { 
	};



	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";

arch/arm/boot/dts/tegra30.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -958,7 +958,7 @@ mmc@78000600 { 
	};



	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 @@ phy1: usb-phy@7d000000 { 
	};



	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 @@ phy2: usb-phy@7d004000 { 
	};



	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";