Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee2ef6b8 authored by Florian Fainelli's avatar Florian Fainelli Committed by Greg Kroah-Hartman
Browse files

MIPS: Netlogic: convert to use OHCI platform driver 



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: default avatarFlorian Fainelli <florian@openwrt.org>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c23920b0

arch/mips/netlogic/xlr/platform.c

+7 −2
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/serial_reg.h>

#include <linux/serial_reg.h>

#include <linux/i2c.h>

#include <linux/i2c.h>

#include <linux/usb/ehci_pdriver.h>

#include <linux/usb/ehci_pdriver.h>

#include <linux/usb/ohci_pdriver.h>





#include <asm/netlogic/haldefs.h>

#include <asm/netlogic/haldefs.h>

#include <asm/netlogic/xlr/iomap.h>

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

	.caps_offset	= 0,

};

};





static struct usb_ohci_pdata xls_usb_ohci_pdata;



static struct platform_device xls_usb_ehci_device =

static struct platform_device xls_usb_ehci_device =

			 USB_PLATFORM_DEV("ehci-platform", 0, PIC_USB_IRQ);

			 USB_PLATFORM_DEV("ehci-platform", 0, PIC_USB_IRQ);

static struct platform_device xls_usb_ohci_device_0 =

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 =

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[] = {

static struct platform_device *xls_platform_devices[] = {

	&xls_usb_ehci_device,

	&xls_usb_ehci_device,
@@ -182,10 +185,12 @@ int xls_platform_usb_init(void) 
	memres += 0x400;

	memres += 0x400;

	xls_usb_ohci_device_0.resource[0].start = memres;

	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.resource[0].end = memres + 0x400 - 1;

	xls_usb_ohci_device_0.dev.platform_data = &xls_usb_ohci_pdata;





	memres += 0x400;

	memres += 0x400;

	xls_usb_ohci_device_1.resource[0].start = memres;

	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.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,

	return platform_add_devices(xls_platform_devices,

				ARRAY_SIZE(xls_platform_devices));

				ARRAY_SIZE(xls_platform_devices));