USB: EHCI: split ehci-omap out to a separate driver (54a41966) · Commits · 戴 / test

drivers/usb/host/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -155,7 +155,7 @@ config USB_EHCI_MXC
		Variation of ARC USB block used in some Freescale chips.

		config USB_EHCI_HCD_OMAP
		bool "EHCI support for OMAP3 and later chips"
		tristate "EHCI support for OMAP3 and later chips"
		depends on USB_EHCI_HCD && ARCH_OMAP
		default y
		---help---

drivers/usb/host/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ 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_EHCI_MXC) += ehci-mxc.o
		obj-$(CONFIG_USB_EHCI_HCD_OMAP) += ehci-omap.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
		@@ -1252,11 +1252,6 @@ MODULE_LICENSE ("GPL");
		#define PLATFORM_DRIVER ehci_hcd_sh_driver
		#endif

		#ifdef CONFIG_USB_EHCI_HCD_OMAP
		#include "ehci-omap.c"
		#define PLATFORM_DRIVER ehci_hcd_omap_driver
		#endif

		#ifdef CONFIG_PPC_PS3
		#include "ehci-ps3.c"
		#define PS3_SYSTEM_BUS_DRIVER ps3_ehci_driver
		@@ -1346,6 +1341,7 @@ MODULE_LICENSE ("GPL");
		!IS_ENABLED(CONFIG_USB_EHCI_HCD_PLATFORM) && \
		!IS_ENABLED(CONFIG_USB_CHIPIDEA_HOST) && \
		!IS_ENABLED(CONFIG_USB_EHCI_MXC) && \
		!IS_ENABLED(CONFIG_USB_EHCI_HCD_OMAP) && \
		!defined(PLATFORM_DRIVER) && \
		!defined(PS3_SYSTEM_BUS_DRIVER) && \
		!defined(OF_PLATFORM_DRIVER) && \

drivers/usb/host/ehci-omap.c

+34 −42

Original line number	Diff line number	Diff line
		@@ -36,6 +36,9 @@
		* - convert to use hwmod and runtime PM
		*/

		#include <linux/kernel.h>
		#include <linux/module.h>
		#include <linux/io.h>
		#include <linux/platform_device.h>
		#include <linux/slab.h>
		#include <linux/usb/ulpi.h>
		@@ -43,6 +46,10 @@
		#include <linux/pm_runtime.h>
		#include <linux/gpio.h>
		#include <linux/clk.h>
		#include <linux/usb.h>
		#include <linux/usb/hcd.h>

		#include "ehci.h"

		#include <linux/platform_data/usb-omap.h>

		@@ -57,9 +64,11 @@
		#define EHCI_INSNREG05_ULPI_EXTREGADD_SHIFT 8
		#define EHCI_INSNREG05_ULPI_WRDATA_SHIFT 0

		/-------------------------------------------------------------------------/
		#define DRIVER_DESC "OMAP-EHCI Host Controller driver"

		static const struct hc_driver ehci_omap_hc_driver;
		static const char hcd_name[] = "ehci-omap";

		/-------------------------------------------------------------------------/


		static inline void ehci_write(void __iomem *base, u32 reg, u32 val)
		@@ -166,6 +175,12 @@ static void disable_put_regulator(
		/* configure so an HC device and id are always provided */
		/* always called with process context; sleeping is OK */

		static struct hc_driver __read_mostly ehci_omap_hc_driver;

		static const struct ehci_driver_overrides ehci_omap_overrides __initdata = {
		.reset = omap_ehci_init,
		};

		/**
		* ehci_hcd_omap_probe - initialize TI-based HCDs
		*
		@@ -315,56 +330,33 @@ static struct platform_driver ehci_hcd_omap_driver = {
		/.suspend = ehci_hcd_omap_suspend, /
		/.resume = ehci_hcd_omap_resume, /
		.driver = {
		.name = "ehci-omap",
		.name = hcd_name,
		}
		};

		/-------------------------------------------------------------------------/

		static const struct hc_driver ehci_omap_hc_driver = {
		.description = hcd_name,
		.product_desc = "OMAP-EHCI Host Controller",
		.hcd_priv_size = sizeof(struct ehci_hcd),

		/*
		* generic hardware linkage
		*/
		.irq = ehci_irq,
		.flags = HCD_MEMORY \| HCD_USB2,

		/*
		* basic lifecycle operations
		*/
		.reset = omap_ehci_init,
		.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,
		static int __init ehci_omap_init(void)
		{
		if (usb_disabled())
		return -ENODEV;

		/*
		* scheduling support
		*/
		.get_frame_number = ehci_get_frame,
		pr_info("%s: " DRIVER_DESC "\n", hcd_name);

		/*
		* root hub support
		*/
		.hub_status_data = ehci_hub_status_data,
		.hub_control = ehci_hub_control,
		.bus_suspend = ehci_bus_suspend,
		.bus_resume = ehci_bus_resume,
		ehci_init_driver(&ehci_omap_hc_driver, &ehci_omap_overrides);
		return platform_driver_register(&ehci_hcd_omap_driver);
		}
		module_init(ehci_omap_init);

		.clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,
		};
		static void __exit ehci_omap_cleanup(void)
		{
		platform_driver_unregister(&ehci_hcd_omap_driver);
		}
		module_exit(ehci_omap_cleanup);

		MODULE_ALIAS("platform:ehci-omap");
		MODULE_AUTHOR("Texas Instruments, Inc.");
		MODULE_AUTHOR("Felipe Balbi <felipe.balbi@nokia.com>");

		MODULE_DESCRIPTION(DRIVER_DESC);
		MODULE_LICENSE("GPL");

Admin message