From patchwork Thu Feb 7 17:34:00 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: 14681 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 572CA24262 for ; Thu, 7 Feb 2013 17:35:39 +0000 (UTC) Received: from mail-ve0-f169.google.com (mail-ve0-f169.google.com [209.85.128.169]) by fiordland.canonical.com (Postfix) with ESMTP id 76444A18DB4 for ; Thu, 7 Feb 2013 17:35:38 +0000 (UTC) Received: by mail-ve0-f169.google.com with SMTP id 15so2616003vea.28 for ; Thu, 07 Feb 2013 09:35:38 -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=XjhdsTQ6D00jgyaUYAwo/yuzXD94WT3L7XIvbtOHTpw=; b=GWpVo7kKq3qvIs2+0X33Fe0gu5yoaTOnsfXBumpomGRKWkEJuB9yo3B1FxEr0pT7kp k2RW1Rh1PldetFyQzeVlx1irfEPAbKxLcDzVuEXXAR5o0JrWfAXV9NXDt2mJFjorntAi iGqJwTf/WhXPzuYtbk0DUGgh7+Z/mNwnmCxUArfyBSMDNiSHmsz/i8NAjFuyq7amZ/od HCJChcQtL9j9QSpUIxuJyBz9/APOKH6U/YCEzsjO0D3mntxcG5/EOW7zoryJxvW9O55X DMr1bkbdDWrm2/rYhKL+0pYZ4okktgH40Uw1fHfBdlIxJlcraf++lr8Df2Po9RbhWIcS 5XSg== X-Received: by 10.52.21.146 with SMTP id v18mr2361252vde.79.1360258537815; Thu, 07 Feb 2013 09:35:37 -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 zo8csp102882vec; Thu, 7 Feb 2013 09:35:37 -0800 (PST) X-Received: by 10.42.91.7 with SMTP id n7mr3790279icm.40.1360258536865; Thu, 07 Feb 2013 09:35:36 -0800 (PST) Received: from mail-pa0-f42.google.com (mail-pa0-f42.google.com [209.85.220.42]) by mx.google.com with ESMTPS id cf7si30927526icc.84.2013.02.07.09.35.36 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 07 Feb 2013 09:35:36 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.42 is neither permitted nor denied by best guess record for domain of manjunath.goudar@linaro.org) client-ip=209.85.220.42; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.42 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-f42.google.com with SMTP id kq12so1565614pab.29 for ; Thu, 07 Feb 2013 09:35:36 -0800 (PST) X-Received: by 10.66.79.135 with SMTP id j7mr8102003pax.0.1360258535950; Thu, 07 Feb 2013 09:35:35 -0800 (PST) Received: from localhost.localdomain ([223.239.143.60]) by mx.google.com with ESMTPS id d8sm47524026pax.23.2013.02.07.09.35.30 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 07 Feb 2013 09:35:35 -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 , Deepak Saxena , Greg KH , Viresh Kumar , Shiraz Hashim , spear-devel@list.st.com Subject: [PATCH 03/10] USB: EHCI: make ehci-spear a separate driver Date: Thu, 7 Feb 2013 23:04:00 +0530 Message-Id: <5113e5e7.c84e420a.08c3.ffffbe87@mx.google.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1360258447-27247-1-git-send-email-yes> References: <1360258447-27247-1-git-send-email-yes> X-Gm-Message-State: ALoCoQnL7qF1I6qr9ABtcko0r7clmD+buXnOLf4zn8wRVNmtiOMO5gKWdQWra/yrBRYKAc4KiBJr From: Manjunath Goudar Separate the Spear host controller driver from ehci-hcd host code into its own driver module. Signed-off-by: Manjunath Goudar Signed-off-by: Deepak Saxena Cc: Greg KH Cc: Alan Stern Cc: Viresh Kumar 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 | 77 ++++++++++++++++++++++------------------- 4 files changed, 51 insertions(+), 41 deletions(-) diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 11e102e..4413075 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 b54a597..c97f4ab 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -28,6 +28,7 @@ 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_OMAP) += ehci-omap.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 obj-$(CONFIG_USB_ISP1362_HCD) += isp1362-hcd.o diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index aaf93ca..68cea63 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -1292,11 +1292,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 @@ -1343,6 +1338,7 @@ MODULE_LICENSE ("GPL"); !IS_ENABLED(CONFIG_USB_EHCI_MXC) && \ !defined(PLATFORM_DRIVER) && \ !IS_ENABLED(CONFIG_USB_EHCI_HCD_OMAP) && \ + !IS_ENABLED(CONFIG_PLAT_SPEAR) && \ !defined(PS3_SYSTEM_BUS_DRIVER) && \ !defined(OF_PLATFORM_DRIVER) && \ !defined(XILINX_OF_PLATFORM_DRIVER) diff --git a/drivers/usb/host/ehci-spear.c b/drivers/usb/host/ehci-spear.c index 466c1bb..6e42cee 100644 --- a/drivers/usb/host/ehci-spear.c +++ b/drivers/usb/host/ehci-spear.c @@ -11,11 +11,25 @@ * more details. */ +#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[] = "ehci-spear"; struct spear_ehci { struct ehci_hcd ehci; @@ -43,40 +57,7 @@ static int ehci_spear_setup(struct usb_hcd *hcd) 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) @@ -209,11 +190,35 @@ static struct platform_driver spear_ehci_hcd_driver = { .remove = spear_ehci_hcd_drv_remove, .shutdown = usb_hcd_platform_shutdown, .driver = { - .name = "spear-ehci", + .name = hcd_name, .bus = &platform_bus_type, .pm = &ehci_spear_pm_ops, .of_match_table = of_match_ptr(spear_ehci_id_table), } }; -MODULE_ALIAS("platform:spear-ehci"); + +static const struct ehci_driver_overrides spear_overrides __initdata = { + .reset = ehci_spear_setup, +}; + +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_LICENSE("GPL");