Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 1bee8d4a23f25b87c58df81656300f741d711b19

Authored by Florian Fainelli
Committed by Greg Kroah-Hartman
1 parent ead92fae12
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

MIPS: Netlogic: use ehci-platform driver 

The EHCI platform driver is suitable for use by the Netlogic XLR platform
since there is nothing specific that the EHCI XLR platform driver does.

Signed-off-by: Florian Fainelli <florian@openwrt.org>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 7 additions and 1 deletions Side-by-side Diff

arch/mips/netlogic/xlr/platform.c
Diff comments   View file @ 1bee8d4
... ... @@ -15,6 +15,7 @@
15 15 #include <linux/serial_8250.h>
16 16 #include <linux/serial_reg.h>
17 17 #include <linux/i2c.h>
  18 +#include <linux/usb/ehci_pdriver.h>
18 19  
19 20 #include <asm/netlogic/haldefs.h>
20 21 #include <asm/netlogic/xlr/iomap.h>
21 22  
... ... @@ -123,8 +124,12 @@
123 124 }, \
124 125 }
125 126  
  127 +static struct usb_ehci_pdata xls_usb_ehci_pdata = {
  128 + .caps_offset = 0,
  129 +};
  130 +
126 131 static struct platform_device xls_usb_ehci_device =
127   - USB_PLATFORM_DEV("ehci-xls", 0, PIC_USB_IRQ);
  132 + USB_PLATFORM_DEV("ehci-platform", 0, PIC_USB_IRQ);
128 133 static struct platform_device xls_usb_ohci_device_0 =
129 134 USB_PLATFORM_DEV("ohci-xls-0", 1, PIC_USB_IRQ);
130 135 static struct platform_device xls_usb_ohci_device_1 =
... ... @@ -172,6 +177,7 @@
172 177 memres = CPHYSADDR((unsigned long)usb_mmio);
173 178 xls_usb_ehci_device.resource[0].start = memres;
174 179 xls_usb_ehci_device.resource[0].end = memres + 0x400 - 1;
  180 + xls_usb_ehci_device.dev.platform_data = &xls_usb_ehci_pdata;
175 181  
176 182 memres += 0x400;
177 183 xls_usb_ohci_device_0.resource[0].start = memres;