From patchwork Fri Feb 15 10:24:08 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: 14835 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 96AD923E0B for ; Fri, 15 Feb 2013 10:24:49 +0000 (UTC) Received: from mail-vb0-f52.google.com (mail-vb0-f52.google.com [209.85.212.52]) by fiordland.canonical.com (Postfix) with ESMTP id 30857A186AE for ; Fri, 15 Feb 2013 10:24:49 +0000 (UTC) Received: by mail-vb0-f52.google.com with SMTP id fa15so2003979vbb.25 for ; Fri, 15 Feb 2013 02:24:48 -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=zrAXFdl4nuOM4YhNZ7GYI9wMIca0djrl7YJwXepefGQ=; b=V9nppu8ZczveibTOQNI5ACWGGc9H8LlQBbqAN9TB93fgbIErys7kHbPl7qckX8agsy lIduHIWQu9iiPwwN2VO3oIiUjV17hxwhSNduaTkSYUzccY7PF6d/f3c77qTrOctJ7d7P o3nS8fn3jwKcCgotXaTwxLkqLtDt2TPe6U6bjKcwJZgjCG7eFoymDTAWirCgmHbvtGXR IADcztcJKc8Oox6W52dBkBUMYSu30F2TvgtbbMszJDxTGM2Wy6N3EMn4h7IQA8xFPd9F eM5wbdc7OgNGc5FHBKmTRMB8FTUADlrVRRHkBT5h+H+Ua+NGDbtOKBOpTS4G6DyWCohs t9JQ== X-Received: by 10.58.85.134 with SMTP id h6mr2514921vez.18.1360923888587; Fri, 15 Feb 2013 02:24:48 -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.221.4.5 with SMTP id oa5csp5069vcb; Fri, 15 Feb 2013 02:24:47 -0800 (PST) X-Received: by 10.68.234.100 with SMTP id ud4mr4878618pbc.8.1360923887470; Fri, 15 Feb 2013 02:24:47 -0800 (PST) Received: from mail-pa0-f48.google.com (mail-pa0-f48.google.com [209.85.220.48]) by mx.google.com with ESMTPS id oj4si4178754pbb.83.2013.02.15.02.24.47 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 15 Feb 2013 02:24:47 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.48 is neither permitted nor denied by best guess record for domain of manjunath.goudar@linaro.org) client-ip=209.85.220.48; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.48 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-f48.google.com with SMTP id hz10so1723442pad.21 for ; Fri, 15 Feb 2013 02:24:47 -0800 (PST) X-Received: by 10.68.138.197 with SMTP id qs5mr4649218pbb.121.1360923886947; Fri, 15 Feb 2013 02:24:46 -0800 (PST) Received: from localhost.localdomain ([223.239.144.44]) by mx.google.com with ESMTPS id kt5sm4327895pbc.30.2013.02.15.02.24.42 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 15 Feb 2013 02:24:46 -0800 (PST) From: Manjunath Goudar 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: [V2 3/8] USB: EHCI: make ehci-s5p a separate driver Date: Fri, 15 Feb 2013 15:54:08 +0530 Message-Id: <1360923853-7875-4-git-send-email-manjunath.goudar@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1360923853-7875-1-git-send-email-manjunath.goudar@linaro.org> References: <1360923853-7875-1-git-send-email-manjunath.goudar@linaro.org> X-Gm-Message-State: ALoCoQmwVmKhtcGyMBZW7Cqzixa5noHdvPQl2W+6Thkgu40laPplCRgW7lMYiCkfj1KdAXuiOY6S Separate the s5p host controller driver from ehci-hcd host code into its own driver module. In V2: Tegra patch related changes removed from this patch. Signed-off-by: Manjunath Goudar Acked-by: Jingoo Han 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 | 67 +++++++++++++++++++++++-------------------- 4 files changed, 39 insertions(+), 37 deletions(-) diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 1ef37d7..8ffbafa 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -215,7 +215,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 b301243..77e0331 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -30,6 +30,7 @@ obj-$(CONFIG_USB_EHCI_MXC) += ehci-mxc.o obj-$(CONFIG_USB_EHCI_HCD_SPEAR)+= ehci-spear.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 dda3d1b..fa0e665 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -1312,11 +1312,6 @@ MODULE_LICENSE ("GPL"); #define PLATFORM_DRIVER tegra_ehci_driver #endif -#ifdef CONFIG_USB_EHCI_S5P -#include "ehci-s5p.c" -#define PLATFORM_DRIVER s5p_ehci_driver -#endif - #ifdef CONFIG_SPARC_LEON #include "ehci-grlib.c" #define PLATFORM_DRIVER ehci_grlib_driver @@ -1339,6 +1334,7 @@ MODULE_LICENSE ("GPL"); !IS_ENABLED(CONFIG_PLAT_SPEAR) && \ !defined(PLATFORM_DRIVER) && \ !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 20ebf6a..8c9cde9 100644 --- a/drivers/usb/host/ehci-s5p.c +++ b/drivers/usb/host/ehci-s5p.c @@ -20,6 +20,17 @@ #include #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) @@ -30,6 +41,9 @@ (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; @@ -39,37 +53,6 @@ struct s5p_ehci_hcd { struct s5p_ehci_platdata *pdata; }; -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_ehci_phy_enable(struct s5p_ehci_hcd *s5p_ehci) { struct platform_device *pdev = to_platform_device(s5p_ehci->dev); @@ -322,5 +305,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_DESCRIPTION(DRIVER_DESC); MODULE_ALIAS("platform:s5p-ehci"); +MODULE_LICENSE("GPL");