From patchwork Tue Mar 26 15:57:11 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: 15674 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 5307F23E00 for ; Tue, 26 Mar 2013 15:58:06 +0000 (UTC) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by fiordland.canonical.com (Postfix) with ESMTP id EE708A199F2 for ; Tue, 26 Mar 2013 15:58:05 +0000 (UTC) Received: by mail-vc0-f177.google.com with SMTP id ia10so5632191vcb.8 for ; Tue, 26 Mar 2013 08:58:05 -0700 (PDT) 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=3IDUiN+sUevmdLdTsYRAWYIq4zm65m3WAGcCZStjB/k=; b=NRlTKB01zPc/okK+L5t/UefyCmX1pQcHVFfAA4hTL74Z+3osvtcqUcsdkTLkdxl1iz KIfVtMZd6YOp/nsh3uTpnn4Uc9w+fqu805rxgw6zhMljLyvFNwI65nO2sWOfGjJiH+iB o4gKtuVhLokPD7Dz2L32zGp27/K04JXdsJw/wFMvbXbxV4SIsDHckZra2d+NiNzLSiRI 0zps6D/PhUvkIiskSGxBHrT1bvHBxkG+KOYR4VOYOXVyyjXjYx6y2qm/IMFxeiBmbOM+ WbEeZAFxEUM9i5wxePC8qdaG/7RwTnYEwpDxN5jksPRNKbSTzyVlNFdJdhOI4w4OguNG toig== X-Received: by 10.52.76.103 with SMTP id j7mr17092339vdw.90.1364313485454; Tue, 26 Mar 2013 08:58:05 -0700 (PDT) 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.59.4.204 with SMTP id cg12csp77702ved; Tue, 26 Mar 2013 08:58:04 -0700 (PDT) X-Received: by 10.68.189.163 with SMTP id gj3mr24792093pbc.4.1364313484251; Tue, 26 Mar 2013 08:58:04 -0700 (PDT) Received: from mail-pd0-f173.google.com (mail-pd0-f173.google.com [209.85.192.173]) by mx.google.com with ESMTPS id zs8si17942573pbc.52.2013.03.26.08.57.58 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 26 Mar 2013 08:57:58 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.192.173 is neither permitted nor denied by best guess record for domain of manjunath.goudar@linaro.org) client-ip=209.85.192.173; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.192.173 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-pd0-f173.google.com with SMTP id v10so3128833pde.4 for ; Tue, 26 Mar 2013 08:57:58 -0700 (PDT) X-Received: by 10.68.106.165 with SMTP id gv5mr1380901pbb.143.1364313477980; Tue, 26 Mar 2013 08:57:57 -0700 (PDT) Received: from localhost.localdomain ([223.229.218.70]) by mx.google.com with ESMTPS id z1sm17959555pbw.19.2013.03.26.08.57.54 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 26 Mar 2013 08:57:57 -0700 (PDT) From: manjunath.goudar@linaro.org To: manjunath.goudar@linaro.org Cc: arnd@linaro.org, patches@linaro.org Subject: [V3 5/5] USB: EHCI: make ehci-msm a separate driver Date: Tue, 26 Mar 2013 21:27:11 +0530 Message-Id: <5151c585.414e440a.3d14.ffffa0f3@mx.google.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1364313431-18170-1-git-send-email-y> References: <1364313431-18170-1-git-send-email-y> X-Gm-Message-State: ALoCoQm4636KE98XupZe6CCRQK1yWWbS2+jl6On/7e0tCz1S454yVnRr1VOUU2PiuAThslJlW2rP From: Manjunath Goudar Separate the Qualcomm QSD/MSM on-chip host controller driver from ehci-hcd host code so that it can be built as a separate driver module. This work is part of enabling multi-platform kernels on ARM; however, note that other changes are still needed before Qualcomm QSD/MSM can be booted with a multi-platform kernel and an ehci driver that only works on one of them. With the infrastructure added by Alan Stern in patch 3e0232039 "USB: EHCI: prepare to make ehci-hcd a library module", we can avoid this problem by turning a bus glue into a separate module, as we do here for the msm bus glue. In V3: 1.Detail commit message added here,why this patch is required. 2.Arranged #include's in alphabetical order. 3.drive.name initialized hcd_name[] = "ehci-msm" in platform_driver structure initialization instead of "msm-ehci",that is reason it was breaking in EHCI USB testing.this one fixed in V3. In V2: Tegra patch related changes removed from this patch. Signed-off-by: Manjunath Goudar Acked-by: Arnd Bergmann Cc: Greg KH Cc: Alan Stern Cc: David Brown Cc: Daniel Walker Cc: Bryan Huntsman Cc: Brian Swetland 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 | 1 + drivers/usb/host/ehci-msm.c | 85 +++++++++++++++++++------------------------ 4 files changed, 40 insertions(+), 49 deletions(-) diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 26754d6..c1f0419 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -179,7 +179,7 @@ config USB_EHCI_HCD_AT91 Atmel chips. config USB_EHCI_MSM - bool "Support for MSM on-chip EHCI USB controller" + tristate "Support for Qualcomm QSD/MSM on-chip EHCI USB controller" depends on USB_EHCI_HCD && ARCH_MSM select USB_EHCI_ROOT_HUB_TT select USB_MSM_OTG diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index e5f380a..b40618b 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -31,6 +31,7 @@ obj-$(CONFIG_USB_EHCI_HCD_SPEAR) += ehci-spear.o obj-$(CONFIG_USB_EHCI_HCD_AT91) += ehci-atmel.o obj-$(CONFIG_USB_EHCI_S5P) += ehci-s5p.o obj-$(CONFIG_USB_EHCI_MV) += ehci-mv.o +obj-$(CONFIG_USB_EHCI_MSM) += ehci-msm.o obj-$(CONFIG_USB_OXU210HP_HCD) += oxu210hp-hcd.o obj-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 1672235..c8220d4 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -1331,6 +1331,7 @@ MODULE_LICENSE ("GPL"); !IS_ENABLED(CONFIG_ARCH_AT91) && \ !IS_ENABLED(CONFIG_USB_EHCI_S5P) && \ !IS_ENABLED(CONFIG_USB_EHCI_MV) && \ + !IS_ENABLED(CONFIG_USB_EHCI_MSM) && \ !defined(PLATFORM_DRIVER) && \ !defined(PS3_SYSTEM_BUS_DRIVER) && \ !defined(OF_PLATFORM_DRIVER) && \ diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c index 88a49c8..3b45f0c 100644 --- a/drivers/usb/host/ehci-msm.c +++ b/drivers/usb/host/ehci-msm.c @@ -22,16 +22,26 @@ * along with this program; if not, you can find it at http://www.fsf.org */ -#include #include #include +#include +#include +#include +#include #include - #include #include +#include +#include + +#include "ehci.h" #define MSM_USB_BASE (hcd->regs) +#define DRIVER_DESC "Qualcomm On-Chip EHCI Host Controller" + +static const char hcd_name[] = "ehci-msm"; +static struct hc_driver __read_mostly msm_hc_driver; static struct usb_phy *phy; static int ehci_msm_reset(struct usb_hcd *hcd) @@ -56,52 +66,6 @@ static int ehci_msm_reset(struct usb_hcd *hcd) return 0; } -static struct hc_driver msm_hc_driver = { - .description = hcd_name, - .product_desc = "Qualcomm On-Chip EHCI Host Controller", - .hcd_priv_size = sizeof(struct ehci_hcd), - - /* - * generic hardware linkage - */ - .irq = ehci_irq, - .flags = HCD_USB2 | HCD_MEMORY, - - .reset = ehci_msm_reset, - .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, - .clear_tt_buffer_complete = ehci_clear_tt_buffer_complete, - - /* - * scheduling support - */ - .get_frame_number = ehci_get_frame, - - /* - * root hub support - */ - .hub_status_data = ehci_hub_status_data, - .hub_control = ehci_hub_control, - .relinquish_port = ehci_relinquish_port, - .port_handed_over = ehci_port_handed_over, - - /* - * PM support - */ - .bus_suspend = ehci_bus_suspend, - .bus_resume = ehci_bus_resume, -}; - static int ehci_msm_probe(struct platform_device *pdev) { struct usb_hcd *hcd; @@ -226,3 +190,28 @@ static struct platform_driver ehci_msm_driver = { .pm = &ehci_msm_dev_pm_ops, }, }; + +static const struct ehci_driver_overrides msm_overrides __initdata = { + .reset = ehci_msm_reset, +}; + +static int __init ehci_msm_init(void) +{ + if (usb_disabled()) + return -ENODEV; + + pr_info("%s: " DRIVER_DESC "\n", hcd_name); + ehci_init_driver(&msm_hc_driver, &msm_overrides); + return platform_driver_register(&ehci_msm_driver); +} +module_init(ehci_msm_init); + +static void __exit ehci_msm_cleanup(void) +{ + platform_driver_unregister(&ehci_msm_driver); +} +module_exit(ehci_msm_cleanup); + +MODULE_DESCRIPTION(DRIVER_DESC); +MODULE_ALIAS("platform:msm-ehci"); +MODULE_LICENSE("GPL");