ARM: dts: Get rid of incompatible ids for hci-omap USB host nodes

The OMAP EHCI and OHCI controllers are not compatible with drivers
other than "ti,ehci-omap" and "ti,ohci-omap3" respectively, so get
rid of the incompatible ids.

CC: Alan Stern <stern@rowland.harvard.edu>
CC: Nishant Menon <nm@ti.com>
CC: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index d392419..b91117a 100644 (file)
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -644,14 +644,14 @@
                        ranges;
 
                        usbhsohci: ohci@48064400 {
-                               compatible = "ti,ohci-omap3", "usb-ohci";
+                               compatible = "ti,ohci-omap3";
                                reg = <0x48064400 0x400>;
                                interrupt-parent = <&intc>;
                                interrupts = <76>;
                        };
 
                        usbhsehci: ehci@48064800 {
-                               compatible = "ti,ehci-omap", "usb-ehci";
+                               compatible = "ti,ehci-omap";
                                reg = <0x48064800 0x400>;
                                interrupt-parent = <&intc>;
                                interrupts = <77>;

diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index afa23bc..a3f93fb 100644 (file)
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -718,14 +718,14 @@
                        ranges;
 
                        usbhsohci: ohci@4a064800 {
-                               compatible = "ti,ohci-omap3", "usb-ohci";
+                               compatible = "ti,ohci-omap3";
                                reg = <0x4a064800 0x400>;
                                interrupt-parent = <&gic>;
                                interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
                        };
 
                        usbhsehci: ehci@4a064c00 {
-                               compatible = "ti,ehci-omap", "usb-ehci";
+                               compatible = "ti,ehci-omap";
                                reg = <0x4a064c00 0x400>;
                                interrupt-parent = <&gic>;
                                interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index 7fe6825..0523697 100644 (file)
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -796,14 +796,14 @@
                        ranges;
 
                        usbhsohci: ohci@4a064800 {
-                               compatible = "ti,ohci-omap3", "usb-ohci";
+                               compatible = "ti,ohci-omap3";
                                reg = <0x4a064800 0x400>;
                                interrupt-parent = <&gic>;
                                interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
                        };
 
                        usbhsehci: ehci@4a064c00 {
-                               compatible = "ti,ehci-omap", "usb-ehci";
+                               compatible = "ti,ehci-omap";
                                reg = <0x4a064c00 0x400>;
                                interrupt-parent = <&gic>;
                                interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;