From patchwork Sun Mar 17 18:31:37 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: 15391 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 CA2F023E2C for ; Sun, 17 Mar 2013 18:32:03 +0000 (UTC) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by fiordland.canonical.com (Postfix) with ESMTP id 543CDA18586 for ; Sun, 17 Mar 2013 18:32:03 +0000 (UTC) Received: by mail-ve0-f177.google.com with SMTP id m1so3810056ves.8 for ; Sun, 17 Mar 2013 11:32:02 -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=ZfLdUz+qG9vgECkBEhj8DwmWw8rARrlpdJA/y7Wrxys=; b=W4gOwbRzL1fZjNJJB1fyxYEkZNjC57990Pxb4rbovpAnhH/irSvOLNTrHdRC+2FvFX uofeg7S3z7/g/CKOLbV9stOSwcshmiEQjPkaC0nmTbEgqh4H5+EIwAhHQXvbz+CBU7jG bKMYOc0YtvQKqvypUg8D7tefe8Q5LastSHnJWRZMzsPZLHPDaA/H3vnJE8SNW668js8n E2w32THzdpMAkNaAWryw9vDAwouUes3Rqs5tb50FZqBT0P31ZMa8+IopALYMg2EST6Na FAe4FyFNlaPTaoTSYeFnh6Ren8AcoFbqP7OtyXq8ADZNq4j5CckqN9BtgZz9kbPkY8mI IxCg== X-Received: by 10.58.188.48 with SMTP id fx16mr16747794vec.22.1363545122770; Sun, 17 Mar 2013 11:32:02 -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.58.127.98 with SMTP id nf2csp208088veb; Sun, 17 Mar 2013 11:32:02 -0700 (PDT) X-Received: by 10.66.2.136 with SMTP id 8mr6394931pau.211.1363545121337; Sun, 17 Mar 2013 11:32:01 -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 pc5si3981061pac.52.2013.03.17.11.32.01 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 17 Mar 2013 11:32:01 -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 un1so5815456pbc.12 for ; Sun, 17 Mar 2013 11:32:00 -0700 (PDT) X-Received: by 10.68.239.231 with SMTP id vv7mr28836876pbc.171.1363545120816; Sun, 17 Mar 2013 11:32:00 -0700 (PDT) Received: from localhost.localdomain ([223.239.138.120]) by mx.google.com with ESMTPS id i9sm5187683paa.7.2013.03.17.11.31.58 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 17 Mar 2013 11:32:00 -0700 (PDT) From: Manjunath Goudar To: manjunath.goudar@linaro.org Cc: arnd@linaro.org, patches@linaro.org Subject: [V3 1/8] USB: EHCI: make ehci-spear a separate driver Date: Mon, 18 Mar 2013 00:01:37 +0530 Message-Id: <1363545104-1677-2-git-send-email-manjunath.goudar@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1363545104-1677-1-git-send-email-manjunath.goudar@linaro.org> References: <1363545104-1677-1-git-send-email-manjunath.goudar@linaro.org> X-Gm-Message-State: ALoCoQlq2/+xl3LL/7sBfuVDCrSgcnrx6Tkhvbd+MnX6IAk3GJlUPb8i/j3KrVdPZNl2853HzfTE 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: 1.Detail commit message added here,why this patch is required. 2.Eliminated the ehci_spear_setup routine beacuse setting ehci registers start at offset 0x0 in spear_ehci_hcd_drv_probe function. 3.Removed .reset field initilaztion from spear_overrides struct. 4.Used .extra_priv_size field, It will allow the driver to be simplified by storing the "clk" field of struct spear_ehci in the private part of the ehci_hcd structure. 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 | 87 ++++++++++++++++++++--------------------- 4 files changed, 52 insertions(+), 50 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..faf8030 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,13 +12,25 @@ */ #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 ehci_hcd *ehci; struct clk *clk; }; @@ -34,49 +46,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) @@ -162,6 +132,8 @@ static int spear_ehci_hcd_drv_probe(struct platform_device *pdev) } ehci = (struct spear_ehci *)hcd_to_ehci(hcd); + /* registers start at offset 0x0 */ + ehci->ehci->caps = hcd->regs; ehci->clk = usbh_clk; spear_start_ehci(ehci); @@ -216,4 +188,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");