Skip to content

Commit

Permalink
MIPS: Netlogic: convert to use OHCI platform driver
Browse files Browse the repository at this point in the history
The OHCI platform driver is suitable for use by the Netlogic XLR platform
so use this driver instead of the OHCI XLS platform driver.

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>
  • Loading branch information
Florian Fainelli authored and Greg Kroah-Hartman committed Oct 22, 2012
1 parent c23920b commit ee2ef6b
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions arch/mips/netlogic/xlr/platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include <linux/serial_reg.h>
#include <linux/i2c.h>
#include <linux/usb/ehci_pdriver.h>
#include <linux/usb/ohci_pdriver.h>

#include <asm/netlogic/haldefs.h>
#include <asm/netlogic/xlr/iomap.h>
Expand Down Expand Up @@ -128,12 +129,14 @@ static struct usb_ehci_pdata xls_usb_ehci_pdata = {
.caps_offset = 0,
};

static struct usb_ohci_pdata xls_usb_ohci_pdata;

static struct platform_device xls_usb_ehci_device =
USB_PLATFORM_DEV("ehci-platform", 0, PIC_USB_IRQ);
static struct platform_device xls_usb_ohci_device_0 =
USB_PLATFORM_DEV("ohci-xls-0", 1, PIC_USB_IRQ);
USB_PLATFORM_DEV("ohci-platform", 1, PIC_USB_IRQ);
static struct platform_device xls_usb_ohci_device_1 =
USB_PLATFORM_DEV("ohci-xls-1", 2, PIC_USB_IRQ);
USB_PLATFORM_DEV("ohci-platform", 2, PIC_USB_IRQ);

static struct platform_device *xls_platform_devices[] = {
&xls_usb_ehci_device,
Expand Down Expand Up @@ -182,10 +185,12 @@ int xls_platform_usb_init(void)
memres += 0x400;
xls_usb_ohci_device_0.resource[0].start = memres;
xls_usb_ohci_device_0.resource[0].end = memres + 0x400 - 1;
xls_usb_ohci_device_0.dev.platform_data = &xls_usb_ohci_pdata;

memres += 0x400;
xls_usb_ohci_device_1.resource[0].start = memres;
xls_usb_ohci_device_1.resource[0].end = memres + 0x400 - 1;
xls_usb_ohci_device_1.dev.platform_data = &xls_usb_ohci_pdata;

return platform_add_devices(xls_platform_devices,
ARRAY_SIZE(xls_platform_devices));
Expand Down

0 comments on commit ee2ef6b

Please sign in to comment.