From patchwork Tue Mar 26 15:57:07 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: 15670 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 287D923E00 for ; Tue, 26 Mar 2013 15:57:42 +0000 (UTC) Received: from mail-ve0-f171.google.com (mail-ve0-f171.google.com [209.85.128.171]) by fiordland.canonical.com (Postfix) with ESMTP id BCB7BA199F7 for ; Tue, 26 Mar 2013 15:57:41 +0000 (UTC) Received: by mail-ve0-f171.google.com with SMTP id b10so5914304vea.16 for ; Tue, 26 Mar 2013 08:57:41 -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=pzq3KT2V7NGhanhg5RPBdtajwUbdGHLhwK/dNL2pq2c=; b=SMLCbgQaVrSLtuGEfo/QiHD0+fz9IFamsETbyLhrZ+uDK9KNfAaRiv5UXPUEyiQu0Q y1ST8HEdcUl0DqFaBL2atW0vYfxVpYgTnElAFcbuur5vzcum7wiPxHb6WovvJSQwNrOF IGUcCh3kpI4ELq/c6q+mxyNcjcWECQyTTCjhdOqst5UQsbvu7r2wgJHejLRpvSO9g7IN a4t3e5aBMeqtcIjJLTMErqVogSvaP2YSSI1/8TR8z2GNXdazqxRw2HtkZIA8uk4GBtlL B7cNwELCamtSpbVF0Y8yupyHCamTsr8xybsMsS6LBsancq5IydUxckflIMmynu9rYWea c0mg== X-Received: by 10.58.210.200 with SMTP id mw8mr19839933vec.32.1364313461216; Tue, 26 Mar 2013 08:57:41 -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 cg12csp77686ved; Tue, 26 Mar 2013 08:57:40 -0700 (PDT) X-Received: by 10.68.87.129 with SMTP id ay1mr24137119pbb.105.1364313459360; Tue, 26 Mar 2013 08:57:39 -0700 (PDT) Received: from mail-pb0-f53.google.com (mail-pb0-f53.google.com [209.85.160.53]) by mx.google.com with ESMTPS id se4si17874174pbc.293.2013.03.26.08.57.39 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 26 Mar 2013 08:57:39 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.160.53 is neither permitted nor denied by best guess record for domain of manjunath.goudar@linaro.org) client-ip=209.85.160.53; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.160.53 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-f53.google.com with SMTP id un1so4775983pbc.40 for ; Tue, 26 Mar 2013 08:57:38 -0700 (PDT) X-Received: by 10.66.192.129 with SMTP id hg1mr24777490pac.34.1364313457375; Tue, 26 Mar 2013 08:57:37 -0700 (PDT) Received: from localhost.localdomain ([223.229.218.70]) by mx.google.com with ESMTPS id z1sm17959555pbw.19.2013.03.26.08.57.32 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 26 Mar 2013 08:57:36 -0700 (PDT) From: manjunath.goudar@linaro.org To: manjunath.goudar@linaro.org Cc: arnd@linaro.org, patches@linaro.org Subject: [V3 1/5] USB: EHCI: make ehci-spear a separate driver Date: Tue, 26 Mar 2013 21:27:07 +0530 Message-Id: <5151c570.414e440a.3d14.ffffa0e5@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: ALoCoQll2XKI3uk35NqA2q1pBY1pVpqCFcF9BsnKlNZs/WrQurpPRgm/oUrLpuBFeuSQcw9qjdDK From: Manjunath Goudar Separate the SPEAr 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 SPEAr can be booted with a multi-platform kernel. 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 SPEAr bus glue. In V3: -Detailed commit message added here about why this patch is required. -Eliminated ehci_spear_setup routine beacuse hcd registers directly setting in spear_ehci_hcd_drv_probe function. -spear_overrides struct initialized. -Eliminate struct ehci_hcd ehci from struct spear_ehci,to enable SPEAr clock uses directly usb_hcd *hcd in spear_start_ehci function. -to_spear_ehci() macro modified for spear_ehci. In V2: Replaced spear as SPEAr everywhere, leaving functions/variables/config options. Signed-off-by: Manjunath Goudar Signed-off-by: Deepak Saxena Acked-by: Viresh Kumar Acked-by: Arnd Bergmann Cc: Greg KH Cc: Alan Stern Cc: Shiraz Hashim Cc: linux-usb@vger.kernel.org Cc: spear-devel@list.st.com --- drivers/usb/host/Kconfig | 8 ++++ drivers/usb/host/Makefile | 1 + drivers/usb/host/ehci-hcd.c | 6 +-- drivers/usb/host/ehci-spear.c | 88 +++++++++++++++++++---------------------- 4 files changed, 51 insertions(+), 52 deletions(-) diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index c59a112..cd4fdac 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -162,6 +162,14 @@ config USB_EHCI_HCD_OMAP Enables support for the on-chip EHCI controller on OMAP3 and later chips. +config USB_EHCI_HCD_SPEAR + tristate "Support for ST SPEAr on-chip EHCI USB controller" + depends on USB_EHCI_HCD && PLAT_SPEAR + default y + ---help--- + Enables support for the on-chip EHCI controller on + ST SPEAr chips. + config USB_EHCI_MSM bool "Support for MSM on-chip EHCI USB controller" depends on USB_EHCI_HCD && ARCH_MSM diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index 001fbff..8da680d 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -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_SPEAR) += ehci-spear.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 b416a3f..c4afd86 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 vt8500_ehci_driver #endif -#ifdef CONFIG_PLAT_SPEAR -#include "ehci-spear.c" -#define PLATFORM_DRIVER spear_ehci_hcd_driver -#endif - #ifdef CONFIG_USB_EHCI_MSM #include "ehci-msm.c" #define PLATFORM_DRIVER ehci_msm_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_PLAT_SPEAR) && \ !defined(PLATFORM_DRIVER) && \ !defined(PS3_SYSTEM_BUS_DRIVER) && \ !defined(OF_PLATFORM_DRIVER) && \ diff --git a/drivers/usb/host/ehci-spear.c b/drivers/usb/host/ehci-spear.c index 466c1bb..261f965 100644 --- a/drivers/usb/host/ehci-spear.c +++ b/drivers/usb/host/ehci-spear.c @@ -1,5 +1,5 @@ /* -* Driver for EHCI HCD on SPEAR SOC +* Driver for EHCI HCD on SPEAr SOC * * Copyright (C) 2010 ST Micro Electronics, * Deepak Sikri @@ -12,17 +12,28 @@ */ #include +#include +#include #include +#include +#include #include #include #include +#include +#include + +#include "ehci.h" + +#define DRIVER_DESC "EHCI SPEAr driver" + +static const char hcd_name[] = "SPEAr-ehci"; struct spear_ehci { - struct ehci_hcd ehci; struct clk *clk; }; -#define to_spear_ehci(hcd) (struct spear_ehci *)hcd_to_ehci(hcd) +#define to_spear_ehci(hcd) (struct spear_ehci *)(hcd_to_ehci(hcd)->priv) static void spear_start_ehci(struct spear_ehci *ehci) { @@ -34,49 +45,7 @@ static void spear_stop_ehci(struct spear_ehci *ehci) clk_disable_unprepare(ehci->clk); } -static int ehci_spear_setup(struct usb_hcd *hcd) -{ - struct ehci_hcd *ehci = hcd_to_ehci(hcd); - - /* registers start at offset 0x0 */ - ehci->caps = hcd->regs; - - return ehci_setup(hcd); -} - -static const struct hc_driver ehci_spear_hc_driver = { - .description = hcd_name, - .product_desc = "SPEAr EHCI", - .hcd_priv_size = sizeof(struct spear_ehci), - - /* generic hardware linkage */ - .irq = ehci_irq, - .flags = HCD_MEMORY | HCD_USB2, - - /* basic lifecycle operations */ - .reset = ehci_spear_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, - .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 struct hc_driver __read_mostly ehci_spear_hc_driver; #ifdef CONFIG_PM static int ehci_spear_drv_suspend(struct device *dev) @@ -161,7 +130,7 @@ static int spear_ehci_hcd_drv_probe(struct platform_device *pdev) goto err_put_hcd; } - ehci = (struct spear_ehci *)hcd_to_ehci(hcd); + ehci = to_spear_ehci(hcd); ehci->clk = usbh_clk; spear_start_ehci(ehci); @@ -216,4 +185,29 @@ static struct platform_driver spear_ehci_hcd_driver = { } }; +static const struct ehci_driver_overrides spear_overrides __initdata = { + .extra_priv_size = sizeof(struct spear_ehci), +}; + +static int __init ehci_spear_init(void) +{ + if (usb_disabled()) + return -ENODEV; + + pr_info("%s: " DRIVER_DESC "\n", hcd_name); + + ehci_init_driver(&ehci_spear_hc_driver, &spear_overrides); + return platform_driver_register(&spear_ehci_hcd_driver); +} +module_init(ehci_spear_init); + +static void __exit ehci_spear_cleanup(void) +{ + platform_driver_unregister(&spear_ehci_hcd_driver); +} +module_exit(ehci_spear_cleanup); + +MODULE_DESCRIPTION(DRIVER_DESC); MODULE_ALIAS("platform:spear-ehci"); +MODULE_AUTHOR("Deepak Sikri"); +MODULE_LICENSE("GPL");