From patchwork Sun Feb 10 18:58:16 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: 14721 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 EE1D023DEA for ; Sun, 10 Feb 2013 18:59:40 +0000 (UTC) Received: from mail-vb0-f48.google.com (mail-vb0-f48.google.com [209.85.212.48]) by fiordland.canonical.com (Postfix) with ESMTP id 8F1B0A195BF for ; Sun, 10 Feb 2013 18:59:40 +0000 (UTC) Received: by mail-vb0-f48.google.com with SMTP id fc21so3339648vbb.21 for ; Sun, 10 Feb 2013 10:59:40 -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=Uzuge5Eqd1It60p+B8f4ndpIs6aj+d4yEGlltwYDLvM=; b=XslcriDvtBoMMLnpFcAv+ooPm47T8I7pWd3Macv/NPgP8PTkhQotqWGhUsasTqV71T 789RQSIrV2rzY2w217eKJwCl091ty0OZFyxV6KWMTZZL7pt6GVc2vd0mFBL7NAgfZjNZ K+4TtuVbz5Ffv1xuO3uy7+BQz0sbev5wp7fDzfesZylX1jroCKrETtZzt7D2azkHxYVU Gy293VasHt5V7jpmm44ZnZwFSmGNYXWMCn526IC5FogLaE5LfeJA27ld0qf/j4tsbD9e OuRFoJXXu4ni4P4P119/lu37EzsdGXpgBA67VZ8MHNgBuzGMRFVN3lPumgzKptHRDKd0 wjIw== X-Received: by 10.58.232.226 with SMTP id tr2mr15670690vec.48.1360522780020; Sun, 10 Feb 2013 10:59:40 -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 zo8csp63556vec; Sun, 10 Feb 2013 10:59:39 -0800 (PST) X-Received: by 10.68.58.2 with SMTP id m2mr12778872pbq.132.1360522778989; Sun, 10 Feb 2013 10:59:38 -0800 (PST) Received: from mail-pb0-f52.google.com (mail-pb0-f52.google.com [209.85.160.52]) by mx.google.com with ESMTPS id j9si47946028pav.271.2013.02.10.10.59.38 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 10 Feb 2013 10:59:38 -0800 (PST) Received-SPF: neutral (google.com: 209.85.160.52 is neither permitted nor denied by best guess record for domain of manjunath.goudar@linaro.org) client-ip=209.85.160.52; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.160.52 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-pb0-f52.google.com with SMTP id ma3so402561pbc.25 for ; Sun, 10 Feb 2013 10:59:38 -0800 (PST) X-Received: by 10.68.223.68 with SMTP id qs4mr12867743pbc.149.1360522778585; Sun, 10 Feb 2013 10:59:38 -0800 (PST) Received: from localhost.localdomain ([223.239.146.70]) by mx.google.com with ESMTPS id p6sm5157070pbc.39.2013.02.10.10.59.34 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 10 Feb 2013 10:59:37 -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 , Wan ZongShun , linux-kernel@vger.kernel.org Subject: [PATCH 7/8] USB: EHCI: make ehci-w90X900 a separate driver Date: Mon, 11 Feb 2013 00:28:16 +0530 Message-Id: <5117ee19.860e440a.097c.3524@mx.google.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1360522697-22902-1-git-send-email-y> References: <1360522697-22902-1-git-send-email-y> X-Gm-Message-State: ALoCoQmOEcO/UYstUSXFkNeVugUSFddlBLzBqUA0KwN7AaDAaAnwvjrFCwROBZRjZr3FFUcg1dgw From: Manjunath Goudar Separate the Nuvoton On-Chip 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: Wan ZongShun Cc: linux-usb@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- drivers/usb/host/Kconfig | 2 +- drivers/usb/host/Makefile | 1 + drivers/usb/host/ehci-hcd.c | 16 +++---- drivers/usb/host/ehci-w90x900.c | 90 +++++++++++++++++---------------------- 4 files changed, 48 insertions(+), 61 deletions(-) diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 751290d..d1d1b09 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -238,7 +238,7 @@ config USB_EHCI_MV only be EHCI host. OTG is controller that can switch to host mode. config USB_W90X900_EHCI - bool "W90X900(W90P910) EHCI support" + tristate "W90X900(W90P910) EHCI support" depends on USB_EHCI_HCD && ARCH_W90X900 ---help--- Enables support for the W90X900 USB controller diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index 75d98b9..e169ba1 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -34,6 +34,7 @@ obj-$(CONFIG_USB_EHCI_S5P) += ehci-s5p.o obj-$(CONFIG_USB_EHCI_MV) += ehci-mv.o obj-$(CONFIG_USB_EHCI_HCD_VT8500)+= ehci-vt8500.o obj-$(CONFIG_USB_EHCI_MSM) += ehci-msm.o +obj-$(CONFIG_USB_W90X900_EHCI) += ehci-w90x900.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 db5f0ce..5fab5fa 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -1272,16 +1272,6 @@ MODULE_LICENSE ("GPL"); #define XILINX_OF_PLATFORM_DRIVER ehci_hcd_xilinx_of_driver #endif -#ifdef CONFIG_PLAT_ORION -#include "ehci-orion.c" -#define PLATFORM_DRIVER ehci_orion_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 @@ -1292,6 +1282,11 @@ MODULE_LICENSE ("GPL"); #define PLATFORM_DRIVER ehci_hcd_tilegx_driver #endif +#ifdef CONFIG_PLAT_ORION +#include "ehci-orion.c" +#define PLATFORM_DRIVER ehci_orion_driver +#endif + #ifdef CONFIG_USB_EHCI_HCD_PMC_MSP #include "ehci-pmcmsp.c" #define PLATFORM_DRIVER ehci_hcd_msp_driver @@ -1323,6 +1318,7 @@ MODULE_LICENSE ("GPL"); !IS_ENABLED(CONFIG_USB_EHCI_MV) && \ !IS_ENABLED(CONFIG_ARCH_VT8500) && \ !IS_ENABLED(CONFIG_USB_EHCI_MSM) && \ + !IS_ENABLED(CONFIG_USB_W90X900_EHCI) && \ !defined(PS3_SYSTEM_BUS_DRIVER) && \ !defined(OF_PLATFORM_DRIVER) && \ !defined(XILINX_OF_PLATFORM_DRIVER) diff --git a/drivers/usb/host/ehci-w90x900.c b/drivers/usb/host/ehci-w90x900.c index 59e0e24..0b677ec 100644 --- a/drivers/usb/host/ehci-w90x900.c +++ b/drivers/usb/host/ehci-w90x900.c @@ -13,11 +13,31 @@ #include +#include +#include +#include +#include +#include +#include +#include +#include +#include "ehci.h" + /* enable phy0 and phy1 for w90p910 */ #define ENPHY (0x01<<8) #define PHY0_CTR (0xA4) #define PHY1_CTR (0xA8) +#define DRIVER_DESC "Nuvoton w90x900 On-Chip EHCI Host driver" + +static const char hcd_name[] = "ehci-w90x900"; + +static struct hc_driver __read_mostly ehci_w90x900_hc_driver; + +static const struct ehci_driver_overrides ehci_w90X900_overrides __initdata = { + .reset = ehci_setup, +}; + static int usb_w90x900_probe(const struct hc_driver *driver, struct platform_device *pdev) { @@ -99,54 +119,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, - - /* - * 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()) @@ -168,12 +140,30 @@ static struct platform_driver ehci_hcd_w90x900_driver = { .probe = ehci_w90x900_probe, .remove = ehci_w90x900_remove, .driver = { - .name = "w90x900-ehci", + .name = hcd_name, .owner = THIS_MODULE, }, }; +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, &ehci_w90X900_overrides); + 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_AUTHOR("Wan ZongShun "); -MODULE_DESCRIPTION("w90p910 usb ehci driver!"); +MODULE_DESCRIPTION(DRIVER_DESC); MODULE_LICENSE("GPL"); MODULE_ALIAS("platform:w90p910-ehci");