ralink: fix USB compatible strings

switch to the upstream compatible strings for ehci and ohci support.

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 48113
This commit is contained in:
John Crispin 2016-01-04 14:21:11 +00:00
parent e17c1e45ad
commit 9b675a2a33
7 changed files with 12 additions and 45 deletions

View file

@ -462,7 +462,7 @@
};
ehci@101c0000 {
compatible = "ralink,rt3xxx-ehci";
compatible = "generic-ehci";
reg = <0x101c0000 0x1000>;
interrupt-parent = <&intc>;
@ -475,7 +475,7 @@
};
ohci@101c1000 {
compatible = "ralink,rt3xxx-ohci";
compatible = "generic-ohci";
reg = <0x101c1000 0x1000>;
interrupt-parent = <&intc>;

View file

@ -298,7 +298,7 @@
};
ehci@101c0000 {
compatible = "ralink,rt3xxx-ehci";
compatible = "generic-ehci";
reg = <0x101c0000 0x1000>;
interrupt-parent = <&intc>;
@ -311,7 +311,7 @@
};
ohci@101c1000 {
compatible = "ralink,rt3xxx-ohci";
compatible = "generic-ohci";
reg = <0x101c1000 0x1000>;
phys = <&usbphy 1>;

View file

@ -362,7 +362,7 @@
};
ehci@101c0000 {
compatible = "ralink,rt3xxx-ehci";
compatible = "generic-ehci";
reg = <0x101c0000 0x1000>;
phys = <&usbphy 1>;
@ -373,7 +373,7 @@
};
ohci@101c1000 {
compatible = "ralink,rt3xxx-ohci";
compatible = "generic-ohci";
reg = <0x101c1000 0x1000>;
phys = <&usbphy 1>;

View file

@ -270,7 +270,7 @@
};
ehci@101c0000 {
compatible = "ralink,rt3xxx-ehci", "ehci-platform";
compatible = "generic-ehci";
reg = <0x101c0000 0x1000>;
interrupt-parent = <&intc>;
@ -280,7 +280,7 @@
};
ohci@101c1000 {
compatible = "ralink,rt3xxx-ohci", "ohci-platform";
compatible = "generic-ohci";
reg = <0x101c1000 0x1000>;
interrupt-parent = <&intc>;

View file

@ -376,7 +376,7 @@
};
ehci@101c0000 {
compatible = "ralink,rt3xxx-ehci", "ehci-platform";
compatible = "generic-ehci";
reg = <0x101c0000 0x1000>;
phys = <&usbphy 1>;
@ -389,7 +389,7 @@
};
ohci@101c1000 {
compatible = "ralink,rt3xxx-ohci", "ohci-platform";
compatible = "generic-ohci";
reg = <0x101c1000 0x1000>;
phys = <&usbphy 1>;

View file

@ -312,7 +312,7 @@
};
ehci@101c0000 {
compatible = "ralink,rt3xxx-ehci", "ehci-platform";
compatible = "generic-ehci";
reg = <0x101c0000 0x1000>;
phys = <&usbphy 1>;
@ -323,7 +323,7 @@
};
ohci@101c1000 {
compatible = "ralink,rt3xxx-ohci", "ohci-platform";
compatible = "generic-ohci";
reg = <0x101c1000 0x1000>;
phys = <&usbphy 1>;

View file

@ -1,33 +0,0 @@
From ef42c519247f677229bcbd1ab622222b165242af Mon Sep 17 00:00:00 2001
From: John Crispin <blogic@openwrt.org>
Date: Sun, 27 Jul 2014 09:49:07 +0100
Subject: [PATCH 30/53] USB: add OHCI/EHCI OF binding
based on f3bc64d6d1f21c1b92d75f233a37b75d77af6963
Signed-off-by: John Crispin <blogic@openwrt.org>
---
drivers/usb/host/ehci-platform.c | 1 +
drivers/usb/host/ohci-platform.c | 1 +
2 files changed, 2 insertions(+)
--- a/drivers/usb/host/ehci-platform.c
+++ b/drivers/usb/host/ehci-platform.c
@@ -381,6 +381,7 @@ static int ehci_platform_resume(struct d
static const struct of_device_id vt8500_ehci_ids[] = {
{ .compatible = "via,vt8500-ehci", },
{ .compatible = "wm,prizm-ehci", },
+ { .compatible = "ralink,rt3xxx-ehci", },
{ .compatible = "generic-ehci", },
{ .compatible = "cavium,octeon-6335-ehci", },
{}
--- a/drivers/usb/host/ohci-platform.c
+++ b/drivers/usb/host/ohci-platform.c
@@ -344,6 +344,7 @@ static int ohci_platform_resume(struct d
#endif /* CONFIG_PM_SLEEP */
static const struct of_device_id ohci_platform_ids[] = {
+ { .compatible = "ralink,rt3xxx-ohci", },
{ .compatible = "generic-ohci", },
{ .compatible = "cavium,octeon-6335-ohci", },
{ }