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

Commit 99f91934 authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

USB: EHCI: make ehci-platform a separate driver 



This patch (as1626) splits the ehci-platform code from ehci-hcd out
into its own separate driver module.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent adfa79d1

drivers/usb/host/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ config USB_OHCI_HCD_PLATFORM 
	  If unsure, say N.



config USB_EHCI_HCD_PLATFORM

	bool "Generic EHCI driver for a platform device"

	tristate "Generic EHCI driver for a platform device"

	depends on USB_EHCI_HCD

	default n

	---help---

drivers/usb/host/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ obj-$(CONFIG_PCI) += pci-quirks.o 


obj-$(CONFIG_USB_EHCI_HCD)	+= ehci-hcd.o

obj-$(CONFIG_USB_EHCI_PCI)	+= ehci-pci.o

obj-$(CONFIG_USB_EHCI_HCD_PLATFORM)	+= ehci-platform.o



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

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

drivers/usb/host/ehci-hcd.c

+1 −5
Original line number Diff line number Diff line
@@ -1357,12 +1357,8 @@ MODULE_LICENSE ("GPL"); 
#define	PLATFORM_DRIVER		ehci_hcd_sead3_driver

#endif



#ifdef CONFIG_USB_EHCI_HCD_PLATFORM

#include "ehci-platform.c"

#define PLATFORM_DRIVER		ehci_platform_driver

#endif



#if !IS_ENABLED(CONFIG_USB_EHCI_PCI) && \

	!IS_ENABLED(CONFIG_USB_EHCI_HCD_PLATFORM) && \

	!defined(PLATFORM_DRIVER) && \

	!defined(PS3_SYSTEM_BUS_DRIVER) && \

	!defined(OF_PLATFORM_DRIVER) && \

drivers/usb/host/ehci-platform.c

+37 −29
Original line number Diff line number Diff line
@@ -18,9 +18,19 @@ 
 *

 * Licensed under the GNU/GPL. See COPYING for details.

 */

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/usb.h>

#include <linux/usb/hcd.h>

#include <linux/usb/ehci_pdriver.h>



#include "ehci.h"



#define DRIVER_DESC "EHCI generic platform driver"



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



static int ehci_platform_reset(struct usb_hcd *hcd)

{

	struct platform_device *pdev = to_platform_device(hcd->self.controller);
@@ -43,36 +53,11 @@ static int ehci_platform_reset(struct usb_hcd *hcd) 
	return 0;

}



static const struct hc_driver ehci_platform_hc_driver = {

	.description		= hcd_name,

	.product_desc		= "Generic Platform EHCI Controller",

	.hcd_priv_size		= sizeof(struct ehci_hcd),



	.irq			= ehci_irq,

	.flags			= HCD_MEMORY | HCD_USB2,

static struct hc_driver __read_mostly ehci_platform_hc_driver;



static const struct ehci_driver_overrides platform_overrides = {

	.product_desc =	"Generic Platform EHCI controller",

	.reset =	ehci_platform_reset,

	.start			= ehci_run,

	.stop			= ehci_stop,

	.shutdown		= ehci_shutdown,



	.urb_enqueue		= ehci_urb_enqueue,

	.urb_dequeue		= ehci_urb_dequeue,

	.endpoint_disable	= ehci_endpoint_disable,

	.endpoint_reset		= ehci_endpoint_reset,



	.get_frame_number	= ehci_get_frame,



	.hub_status_data	= ehci_hub_status_data,

	.hub_control		= ehci_hub_control,

#if defined(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 __devinit ehci_platform_probe(struct platform_device *dev)
@@ -218,3 +203,26 @@ static struct platform_driver ehci_platform_driver = { 
		.pm	= &ehci_platform_pm_ops,

	}

};



static int __init ehci_platform_init(void)

{

	if (usb_disabled())

		return -ENODEV;



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



	ehci_init_driver(&ehci_platform_hc_driver, &platform_overrides);

	return platform_driver_register(&ehci_platform_driver);

}

module_init(ehci_platform_init);



static void __exit ehci_platform_cleanup(void)

{

	platform_driver_unregister(&ehci_platform_driver);

}

module_exit(ehci_platform_cleanup);



MODULE_DESCRIPTION(DRIVER_DESC);

MODULE_AUTHOR("Hauke Mehrtens");

MODULE_AUTHOR("Alan Stern");

MODULE_LICENSE("GPL");