Commit a60f4f81 authored by Manjunath Goudar's avatar Manjunath Goudar Committed by Greg Kroah-Hartman
Browse files

USB: EHCI: make ehci-w90X900 a separate driver 



Separate the W90X900(W90P910) on-chip host controller driver from
ehci-hcd host code so that it can be built as a separate driver module.
This work is part of enabling multi-platform kernels on ARM;
however, note that other changes are still needed before W90X900(W90P910)
can be booted with a multi-platform kernel

and an ehci driver that only works on one of them.

With the infrastructure added by Alan Stern in patch 3e023203
"USB: EHCI: prepare to make ehci-hcd a library module", we can
avoid this problem by turning a bus glue into a separate
module, as we do here for the w90X900 bus glue.

This patch is rebased on greghk/usb-next 3.12 rc1.

Signed-off-by: default avatarManjunath Goudar <manjunath.goudar@linaro.org>
Signed-off-by: default avatarDeepak Saxena <dsaxena@linaro.org>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarWan ZongShun <mcuos.com@gmail.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 833efc0e

drivers/usb/host/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ config USB_EHCI_MV 
	  on-chip EHCI USB controller" for those.



config USB_W90X900_EHCI

	bool "W90X900(W90P910) EHCI support"

	tristate "W90X900(W90P910) EHCI support"

	depends on ARCH_W90X900

	---help---

		Enables support for the W90X900 USB controller

drivers/usb/host/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ obj-$(CONFIG_USB_EHCI_S5P) += ehci-s5p.o 
obj-$(CONFIG_USB_EHCI_HCD_AT91) += ehci-atmel.o

obj-$(CONFIG_USB_EHCI_MSM)	+= ehci-msm.o

obj-$(CONFIG_USB_EHCI_TEGRA)	+= ehci-tegra.o

obj-$(CONFIG_USB_W90X900_EHCI)	+= ehci-w90x900.o



obj-$(CONFIG_USB_OXU210HP_HCD)	+= oxu210hp-hcd.o

obj-$(CONFIG_USB_ISP116X_HCD)	+= isp116x-hcd.o

drivers/usb/host/ehci-hcd.c

+0 −5
Original line number Diff line number Diff line
@@ -1238,11 +1238,6 @@ MODULE_LICENSE ("GPL"); 
#define XILINX_OF_PLATFORM_DRIVER	ehci_hcd_xilinx_of_driver

#endif



#ifdef CONFIG_USB_W90X900_EHCI

#include "ehci-w90x900.c"

#define	PLATFORM_DRIVER		ehci_hcd_w90x900_driver

#endif



#ifdef CONFIG_USB_OCTEON_EHCI

#include "ehci-octeon.c"

#define PLATFORM_DRIVER		ehci_octeon_driver

drivers/usb/host/ehci-w90x900.c

+37 −52
Original line number Diff line number Diff line
@@ -11,13 +11,28 @@ 
 *

 */



#include <linux/dma-mapping.h>

#include <linux/io.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/platform_device.h>

#include <linux/usb.h>

#include <linux/usb/hcd.h>



#include "ehci.h"



/* enable phy0 and phy1 for w90p910 */

#define	ENPHY		(0x01<<8)

#define PHY0_CTR	(0xA4)

#define PHY1_CTR	(0xA8)



#define DRIVER_DESC "EHCI w90x900 driver"



static const char hcd_name[] = "ehci-w90x900 ";



static struct hc_driver __read_mostly ehci_w90x900_hc_driver;



static int usb_w90x900_probe(const struct hc_driver *driver,

		      struct platform_device *pdev)

{
@@ -90,8 +105,8 @@ err1: 
	return retval;

}



static

void usb_w90x900_remove(struct usb_hcd *hcd, struct platform_device *pdev)

static void usb_w90x900_remove(struct usb_hcd *hcd,

			struct platform_device *pdev)

{

	usb_remove_hcd(hcd);

	iounmap(hcd->regs);
@@ -99,54 +114,6 @@ void usb_w90x900_remove(struct usb_hcd *hcd, struct platform_device *pdev) 
	usb_put_hcd(hcd);

}



static const struct hc_driver ehci_w90x900_hc_driver = {

	.description = hcd_name,

	.product_desc = "Nuvoton w90x900 EHCI Host Controller",

	.hcd_priv_size = sizeof(struct ehci_hcd),



	/*

	 * generic hardware linkage

	 */

	.irq = ehci_irq,

	.flags = HCD_USB2|HCD_MEMORY|HCD_BH,



	/*

	 * basic lifecycle operations

	 */

	.reset = ehci_setup,

	.start = ehci_run,



	.stop = ehci_stop,

	.shutdown = ehci_shutdown,



	/*

	 * managing i/o requests and associated device resources

	 */

	.urb_enqueue = ehci_urb_enqueue,

	.urb_dequeue = ehci_urb_dequeue,

	.endpoint_disable = ehci_endpoint_disable,

	.endpoint_reset = ehci_endpoint_reset,



	/*

	 * scheduling support

	 */

	.get_frame_number = ehci_get_frame,



	/*

	 * root hub support

	 */

	.hub_status_data = ehci_hub_status_data,

	.hub_control = ehci_hub_control,

#ifdef	CONFIG_PM

	.bus_suspend = ehci_bus_suspend,

	.bus_resume = ehci_bus_resume,

#endif

	.relinquish_port	= ehci_relinquish_port,

	.port_handed_over	= ehci_port_handed_over,



	.clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,

};



static int ehci_w90x900_probe(struct platform_device *pdev)

{

	if (usb_disabled())
@@ -173,7 +140,25 @@ static struct platform_driver ehci_hcd_w90x900_driver = { 
	},

};



static int __init ehci_w90X900_init(void)

{

	if (usb_disabled())

		return -ENODEV;



	pr_info("%s: " DRIVER_DESC "\n", hcd_name);



	ehci_init_driver(&ehci_w90x900_hc_driver, NULL);

	return platform_driver_register(&ehci_hcd_w90x900_driver);

}

module_init(ehci_w90X900_init);



static void __exit ehci_w90X900_cleanup(void)

{

	platform_driver_unregister(&ehci_hcd_w90x900_driver);

}

module_exit(ehci_w90X900_cleanup);



MODULE_DESCRIPTION(DRIVER_DESC);

MODULE_AUTHOR("Wan ZongShun <mcuos.com@gmail.com>");

MODULE_DESCRIPTION("w90p910 usb ehci driver!");

MODULE_LICENSE("GPL");

MODULE_ALIAS("platform:w90p910-ehci");

MODULE_LICENSE("GPL v2");

CRA Git | Maintained and supported by SUSTech CRA and CCSE