From patchwork Thu Feb 7 17:34:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: manjunath.goudar@linaro.org X-Patchwork-Id: 14684 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 3462024262 for ; Thu, 7 Feb 2013 17:36:26 +0000 (UTC) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by fiordland.canonical.com (Postfix) with ESMTP id C6A0EA18DE4 for ; Thu, 7 Feb 2013 17:36:25 +0000 (UTC) Received: by mail-vc0-f179.google.com with SMTP id gb23so1744108vcb.24 for ; Thu, 07 Feb 2013 09:36:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=vQ3TGPU0yhIvcZIZqRnpaPCiYYVwxOV7+FFDOAQk8oM=; b=DRF5D1mIcKekSkqcocy2Nk12cajDt4CwF/nxtBFcjb4UAWwneV8nXGFR3wg0ibAigl tYyPTW/PIARBXoA7Vwpf9jhvgHAH89Hu+7swsnnKQYhsqw8LygN8dsRqevunQ59fu2Qc t0XrnZSdKfApGKgunFFul7rCmoFFy0qdWNBwGWqeysf5scH1VFLm+DGDsMbzJYIQom4/ redAhYr3txrYfeRCRDMbCNWCAWi2Jp6Lhew5tcTSfEKLhPKlYGWzVttgRlPYmd5OsUFq /j3PO+rU170IpZVt9Qk+Y0h3qvoBlAOi0m26jAuei0ZRi1hZxXNkTAf72y70Adkm3AYe JlVg== X-Received: by 10.52.66.14 with SMTP id b14mr2514663vdt.0.1360258584917; Thu, 07 Feb 2013 09:36:24 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.252.8 with SMTP id zo8csp102927vec; Thu, 7 Feb 2013 09:36:24 -0800 (PST) X-Received: by 10.50.191.228 with SMTP id hb4mr4578563igc.37.1360258584110; Thu, 07 Feb 2013 09:36:24 -0800 (PST) Received: from mail-pa0-f44.google.com (mail-pa0-f44.google.com [209.85.220.44]) by mx.google.com with ESMTPS id a6si35689113paw.197.2013.02.07.09.36.23 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 07 Feb 2013 09:36:24 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.44 is neither permitted nor denied by best guess record for domain of manjunath.goudar@linaro.org) client-ip=209.85.220.44; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.44 is neither permitted nor denied by best guess record for domain of manjunath.goudar@linaro.org) smtp.mail=manjunath.goudar@linaro.org Received: by mail-pa0-f44.google.com with SMTP id kp1so1565015pab.17 for ; Thu, 07 Feb 2013 09:36:23 -0800 (PST) X-Received: by 10.66.77.201 with SMTP id u9mr7665834paw.80.1360258583423; Thu, 07 Feb 2013 09:36:23 -0800 (PST) Received: from localhost.localdomain ([223.239.143.60]) by mx.google.com with ESMTPS id d8sm47524026pax.23.2013.02.07.09.36.18 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 07 Feb 2013 09:36:22 -0800 (PST) From: manjunath.goudar@linaro.org To: linux-usb@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, patches@linaro.org, stern@rowland.harvard.edu, arnd@linaro.org, gregkh@linuxfoundation.org, Manjunath Goudar , Greg KH , Kukjin Kim , Kyungmin Park , Grant Likely , Rob Herring Subject: [PATCH 06/10] USB: EHCI: make ehci-s5p a separate driver Date: Thu, 7 Feb 2013 23:04:03 +0530 Message-Id: <5113e616.c84e420a.08c3.ffffbeed@mx.google.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1360258447-27247-1-git-send-email-yes> References: <1360258447-27247-1-git-send-email-yes> X-Gm-Message-State: ALoCoQmHlagEH9s54ttggThdw30Q390AprUJYT9/BptzCiqedd19W5z7ZgNMRYPGj72THo8vlTfR From: Manjunath Goudar Separate the s5p host controller driver from ehci-hcd host code into its own driver module. Signed-off-by: Manjunath Goudar Cc: Greg KH Cc: Alan Stern Cc: Kukjin Kim Cc: Kyungmin Park Cc: Grant Likely Cc: Rob Herring Cc: linux-usb@vger.kernel.org --- drivers/usb/host/Kconfig | 2 +- drivers/usb/host/Makefile | 1 + drivers/usb/host/ehci-hcd.c | 6 +--- drivers/usb/host/ehci-s5p.c | 69 +++++++++++++++++++++++-------------------- 4 files changed, 40 insertions(+), 38 deletions(-) diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 5a13f9d..f2e0ed3 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -221,7 +221,7 @@ config USB_EHCI_SH If you use the PCI EHCI controller, this option is not necessary. config USB_EHCI_S5P - boolean "S5P EHCI support" + tristate "S5P EHCI support" depends on USB_EHCI_HCD && PLAT_S5P help Enable support for the S5P SOC's on-chip EHCI controller. diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index 96b4839..5c4f5e1 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -32,6 +32,7 @@ obj-$(CONFIG_USB_EHCI_HCD_SPEAR)+= ehci-spear.o obj-$(CONFIG_USB_EHCI_HCD_ORION)+= ehci-orion.o obj-$(CONFIG_USB_OXU210HP_HCD) += oxu210hp-hcd.o obj-$(CONFIG_USB_EHCI_HCD_AT91) += ehci-atmel.o +obj-$(CONFIG_USB_EHCI_S5P) += ehci-s5p.o obj-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o obj-$(CONFIG_USB_ISP1362_HCD) += isp1362-hcd.o obj-$(CONFIG_USB_OHCI_HCD) += ohci-hcd.o diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 628ed139..36557e3 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -1297,11 +1297,6 @@ MODULE_LICENSE ("GPL"); #define PLATFORM_DRIVER ehci_hcd_msp_driver #endif -#ifdef CONFIG_USB_EHCI_TEGRA -#include "ehci-tegra.c" -#define PLATFORM_DRIVER tegra_ehci_driver -#endif - #ifdef CONFIG_USB_EHCI_S5P #include "ehci-s5p.c" #define PLATFORM_DRIVER s5p_ehci_driver @@ -1330,6 +1325,7 @@ MODULE_LICENSE ("GPL"); !IS_ENABLED(CONFIG_USB_EHCI_HCD_OMAP) && \ !IS_ENABLED(CONFIG_PLAT_SPEAR) && \ !IS_ENABLED(CONFIG_ARCH_AT91) && \ + !IS_ENABLED(CONFIG_USB_EHCI_S5P) && \ !defined(PS3_SYSTEM_BUS_DRIVER) && \ !defined(OF_PLATFORM_DRIVER) && \ !defined(XILINX_OF_PLATFORM_DRIVER) diff --git a/drivers/usb/host/ehci-s5p.c b/drivers/usb/host/ehci-s5p.c index 319dcfa..653e096 100644 --- a/drivers/usb/host/ehci-s5p.c +++ b/drivers/usb/host/ehci-s5p.c @@ -18,6 +18,16 @@ #include #include #include +#include +#include +#include +#include +#include +#include + +#include "ehci.h" + +#define DRIVER_DESC "EHCI s5p driver" #define EHCI_INSNREG00(base) (base + 0x90) #define EHCI_INSNREG00_ENA_INCR16 (0x1 << 25) @@ -28,43 +38,16 @@ (EHCI_INSNREG00_ENA_INCR16 | EHCI_INSNREG00_ENA_INCR8 | \ EHCI_INSNREG00_ENA_INCR4 | EHCI_INSNREG00_ENA_INCRX_ALIGN) +static const char hcd_name[] = "ehci-s5p"; +static struct hc_driver __read_mostly s5p_ehci_hc_driver; + + struct s5p_ehci_hcd { struct device *dev; struct usb_hcd *hcd; struct clk *clk; }; -static const struct hc_driver s5p_ehci_hc_driver = { - .description = hcd_name, - .product_desc = "S5P EHCI Host Controller", - .hcd_priv_size = sizeof(struct ehci_hcd), - - .irq = ehci_irq, - .flags = HCD_MEMORY | HCD_USB2, - - .reset = ehci_setup, - .start = ehci_run, - .stop = ehci_stop, - .shutdown = ehci_shutdown, - - .get_frame_number = ehci_get_frame, - - .urb_enqueue = ehci_urb_enqueue, - .urb_dequeue = ehci_urb_dequeue, - .endpoint_disable = ehci_endpoint_disable, - .endpoint_reset = ehci_endpoint_reset, - - .hub_status_data = ehci_hub_status_data, - .hub_control = ehci_hub_control, - .bus_suspend = ehci_bus_suspend, - .bus_resume = ehci_bus_resume, - - .relinquish_port = ehci_relinquish_port, - .port_handed_over = ehci_port_handed_over, - - .clear_tt_buffer_complete = ehci_clear_tt_buffer_complete, -}; - static void s5p_setup_vbus_gpio(struct platform_device *pdev) { int err; @@ -283,5 +266,27 @@ static struct platform_driver s5p_ehci_driver = { .of_match_table = of_match_ptr(exynos_ehci_match), } }; +static const struct ehci_driver_overrides s5p_overrides __initdata = { + .reset = ehci_setup, +}; + +static int __init ehci_s5p_init(void) +{ + if (usb_disabled()) + return -ENODEV; + + pr_info("%s: " DRIVER_DESC "\n", hcd_name); + ehci_init_driver(&s5p_ehci_hc_driver, &s5p_overrides); + return platform_driver_register(&s5p_ehci_driver); +} +module_init(ehci_s5p_init); + +static void __exit ehci_s5p_cleanup(void) +{ + platform_driver_unregister(&s5p_ehci_driver); +} +module_exit(ehci_s5p_cleanup); -MODULE_ALIAS("platform:s5p-ehci"); +MODULE_DESCRIPTION(DRIVER_DESC); +MODULE_ALIAS("platform:ehci-s5p"); +MODULE_LICENSE("GPL");