From patchwork Sun Feb 10 18:58:13 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: 14718 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 1372723DEA for ; Sun, 10 Feb 2013 18:59:18 +0000 (UTC) Received: from mail-ve0-f179.google.com (mail-ve0-f179.google.com [209.85.128.179]) by fiordland.canonical.com (Postfix) with ESMTP id A8EADA19547 for ; Sun, 10 Feb 2013 18:59:17 +0000 (UTC) Received: by mail-ve0-f179.google.com with SMTP id da11so4681304veb.10 for ; Sun, 10 Feb 2013 10:59:17 -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=ynvB02UG0Gq7rYOIZP5o+NOmcD+0QNEzJkilQILH0wk=; b=MkBreyZNoSEFStsmzvQ98q+bf/gow9dFfiDZU52NagRmKFUTajNWZ4w8nYCIzEAyEO gOzg4wPHNc3NHkZCdpJI3YcreO1g+Qj0d1epLnb+IIy8aNiYanawCnBPubiP0S/uOLsa ZAyWlFw3emsD5VPbdqCPcR0xtQ1eYKr6fCC6sTLny6irxf6C0aroi8c2w0YJJOVlCV6V ZhMlgXWgh0qXqZPYp4LYEF5ROXzd9wDhAeymQJVZUxO9oLF9RgSU1JcxdcmnVcGAG2GZ s41HEZ2qxTpfxwJwGJyuNUeBx5ehdn18TGSzfZY8v+lJm0xl+vVJgSQcGB8q/8pBUxxY eK1g== X-Received: by 10.52.38.234 with SMTP id j10mr3007531vdk.0.1360522757153; Sun, 10 Feb 2013 10:59:17 -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 zo8csp63536vec; Sun, 10 Feb 2013 10:59:16 -0800 (PST) X-Received: by 10.68.194.166 with SMTP id hx6mr12864685pbc.128.1360522756339; Sun, 10 Feb 2013 10:59:16 -0800 (PST) Received: from mail-da0-f53.google.com (mail-da0-f53.google.com [209.85.210.53]) by mx.google.com with ESMTPS id ae10si4544084pbd.176.2013.02.10.10.59.16 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 10 Feb 2013 10:59:16 -0800 (PST) Received-SPF: neutral (google.com: 209.85.210.53 is neither permitted nor denied by best guess record for domain of manjunath.goudar@linaro.org) client-ip=209.85.210.53; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.210.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-da0-f53.google.com with SMTP id w3so180184dad.40 for ; Sun, 10 Feb 2013 10:59:16 -0800 (PST) X-Received: by 10.68.223.68 with SMTP id qs4mr12865822pbc.149.1360522755915; Sun, 10 Feb 2013 10:59:15 -0800 (PST) Received: from localhost.localdomain ([223.239.146.70]) by mx.google.com with ESMTPS id p6sm5157070pbc.39.2013.02.10.10.59.11 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 10 Feb 2013 10:59:15 -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 , Jason Cooper , Andrew Lunn , linux-kernel@vger.kernel.org Subject: [PATCH 4/8] USB: EHCI: make ehci-mv a separate driver Date: Mon, 11 Feb 2013 00:28:13 +0530 Message-Id: <5117ee03.860e440a.097c.3519@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: ALoCoQnykSeKI6hVJt4DN1uRpSmRITFk/sabfYY5p1Anh6kOM8hqtpkQ6qaUpM/dbasrjoxhNMGD From: Manjunath Goudar Separate the mv(marvell) 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: Jason Cooper Cc: Andrew Lunn 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 | 6 +--- drivers/usb/host/ehci-mv.c | 80 ++++++++++++++++++++----------------------- 4 files changed, 40 insertions(+), 49 deletions(-) diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 8ffbafa..2aa4ece 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -221,7 +221,7 @@ config USB_EHCI_S5P Enable support for the S5P SOC's on-chip EHCI controller. config USB_EHCI_MV - bool "EHCI support for Marvell on-chip controller" + tristate "EHCI support for Marvell on-chip controller" depends on USB_EHCI_HCD && (ARCH_PXA || ARCH_MMP) select USB_EHCI_ROOT_HUB_TT ---help--- diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index 77e0331..d593017 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_OXU210HP_HCD) += oxu210hp-hcd.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_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 22c50fb..d133f6d 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -1317,11 +1317,6 @@ MODULE_LICENSE ("GPL"); #define PLATFORM_DRIVER ehci_grlib_driver #endif -#ifdef CONFIG_USB_EHCI_MV -#include "ehci-mv.c" -#define PLATFORM_DRIVER ehci_mv_driver -#endif - #ifdef CONFIG_MIPS_SEAD3 #include "ehci-sead3.c" #define PLATFORM_DRIVER ehci_hcd_sead3_driver @@ -1335,6 +1330,7 @@ MODULE_LICENSE ("GPL"); !IS_ENABLED(CONFIG_PLAT_SPEAR) && \ !IS_ENABLED(CONFIG_ARCH_AT91) && \ !IS_ENABLED(CONFIG_USB_EHCI_S5P) && \ + !IS_ENABLED(CONFIG_USB_EHCI_MV) && \ !defined(PS3_SYSTEM_BUS_DRIVER) && \ !defined(OF_PLATFORM_DRIVER) && \ !defined(XILINX_OF_PLATFORM_DRIVER) diff --git a/drivers/usb/host/ehci-mv.c b/drivers/usb/host/ehci-mv.c index 3065809..67de419 100644 --- a/drivers/usb/host/ehci-mv.c +++ b/drivers/usb/host/ehci-mv.c @@ -17,7 +17,18 @@ #include #include +#include +#include +#include +#include + +#include "ehci.h" + +#define DRIVER_DESC "EHCI mv driver" + #define CAPLENGTH_MASK (0xff) +static const char hcd_name[] = "ehci-mv"; +static struct hc_driver __read_mostly mv_ehci_hc_driver; struct ehci_hcd_mv { struct usb_hcd *hcd; @@ -95,48 +106,6 @@ static int mv_ehci_reset(struct usb_hcd *hcd) return retval; } -static const struct hc_driver mv_ehci_hc_driver = { - .description = hcd_name, - .product_desc = "Marvell EHCI", - .hcd_priv_size = sizeof(struct ehci_hcd), - - /* - * generic hardware linkage - */ - .irq = ehci_irq, - .flags = HCD_MEMORY | HCD_USB2, - - /* - * basic lifecycle operations - */ - .reset = mv_ehci_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, - .bus_suspend = ehci_bus_suspend, - .bus_resume = ehci_bus_resume, -}; - static int mv_ehci_probe(struct platform_device *pdev) { struct mv_usb_platform_data *pdata = pdev->dev.platform_data; @@ -350,8 +319,33 @@ static struct platform_driver ehci_mv_driver = { .remove = mv_ehci_remove, .shutdown = mv_ehci_shutdown, .driver = { - .name = "mv-ehci", + .name = hcd_name, .bus = &platform_bus_type, }, .id_table = ehci_id_table, }; +static const struct ehci_driver_overrides mv_overrides __initdata = { + .reset = mv_ehci_reset, +}; + +static int __init ehci_mv_init(void) +{ + if (usb_disabled()) + return -ENODEV; + + pr_info("%s: " DRIVER_DESC "\n", hcd_name); + ehci_init_driver(&mv_ehci_hc_driver, &mv_overrides); + return platform_driver_register(&ehci_mv_driver); +} +module_init(ehci_mv_init); + +static void __exit ehci_mv_cleanup(void) +{ + platform_driver_unregister(&ehci_mv_driver); +} +module_exit(ehci_mv_cleanup); + +MODULE_DESCRIPTION(DRIVER_DESC); +MODULE_ALIAS("platform:ehci-mv"); +MODULE_AUTHOR("Marvell"); +MODULE_LICENSE("GPL");