From patchwork Sun Mar 17 18:31:39 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: 15393 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 7823323E2C for ; Sun, 17 Mar 2013 18:32:09 +0000 (UTC) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by fiordland.canonical.com (Postfix) with ESMTP id 2137DA1882A for ; Sun, 17 Mar 2013 18:32:09 +0000 (UTC) Received: by mail-vc0-f170.google.com with SMTP id lf10so2457682vcb.15 for ; Sun, 17 Mar 2013 11:32:08 -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=fgim8pZ67jR/+sZ3iZ0Noq6M8lPrBCmL24wHUla2auQ=; b=eUmzMTTzqET4fwMYkf3jfarepfaKk7UnjUUh1o+OZOCRW3v4ktpgDVlhKrIz46KaQL OcikL+tbmYgLeao49/EjEbgmthTR6DwKu3/GQse2ZZ/pgeA0AZ7q4utMJSk8gm3s4rsk 9sXFJKnXbacTMiU4GYwJXZsz38f3svl4uiFmA4vpznFd28E7/nf7aJI2dko5PZ2PYT7D v63SxH0fTb76s4CwwlvmEGV1Oy9eHfhaHCkRaBp27pt3rpg/2neBd33g+noSG2dQSqoE Y2IPFwxS5SNMz6OrtMIZBbGdwfQQ2DVOHqju72JaNyFFz5KOdEbGV2d4Vf8z4ehIkYM6 ARsw== X-Received: by 10.58.48.166 with SMTP id m6mr16415016ven.59.1363545128585; Sun, 17 Mar 2013 11:32:08 -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 nf2csp208090veb; Sun, 17 Mar 2013 11:32:07 -0700 (PDT) X-Received: by 10.66.179.41 with SMTP id dd9mr6353910pac.30.1363545127178; Sun, 17 Mar 2013 11:32:07 -0700 (PDT) Received: from mail-da0-x22d.google.com (mail-da0-x22d.google.com [2607:f8b0:400e:c00::22d]) by mx.google.com with ESMTPS id lo5si3981280pab.56.2013.03.17.11.32.06 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 17 Mar 2013 11:32:07 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400e:c00::22d is neither permitted nor denied by best guess record for domain of manjunath.goudar@linaro.org) client-ip=2607:f8b0:400e:c00::22d; Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400e:c00::22d 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-f45.google.com with SMTP id v40so894380dad.32 for ; Sun, 17 Mar 2013 11:32:06 -0700 (PDT) X-Received: by 10.68.116.169 with SMTP id jx9mr28753503pbb.94.1363545126590; Sun, 17 Mar 2013 11:32:06 -0700 (PDT) Received: from localhost.localdomain ([223.239.138.120]) by mx.google.com with ESMTPS id i9sm5187683paa.7.2013.03.17.11.32.04 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 17 Mar 2013 11:32:05 -0700 (PDT) From: Manjunath Goudar To: manjunath.goudar@linaro.org Cc: arnd@linaro.org, patches@linaro.org Subject: [V3 3/8] USB: EHCI: make ehci-s5p a separate driver Date: Mon, 18 Mar 2013 00:01:39 +0530 Message-Id: <1363545104-1677-4-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: ALoCoQkq65CturO3eOBtfep846CsBR0q6aqRali3qHB54zDwWPZOJbMr2HI0yr1y/OTF7VAO5Hp2 Separate the Samsung S5P/EXYNOS 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 S5P/EXYNOS 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 s5p bus glue. In V3: 1.Detail commit message added here,why this patch is required. 2.MODULE_LICENSE is GPL v2. 3.Added .extra_priv_size to eliminate the separate allocation of the s5p_ehci_hcd structure and removed .reset function pointer initialization. 4.Arranged #include's in alphabetical order. 5.After using extra_priv_size initialization,struct usb_hcd *hcd is redundant that's why removed from the prob function. In V2: Tegra patch related changes removed from this patch. Signed-off-by: Manjunath Goudar Acked-by: Jingoo Han Acked-by: Arnd Bergmann Cc: Greg KH Cc: Alan Stern Cc: Kukjin Kim Cc: Kyungmin Park Cc: Grant Likely Cc: Rob Herring Cc: linux-usb@vger.kernel.org --- drivers/usb/host/Kconfig | 5 ++- drivers/usb/host/Makefile | 1 + drivers/usb/host/ehci-hcd.c | 6 +-- drivers/usb/host/ehci-s5p.c | 95 +++++++++++++++++++++++-------------------- 4 files changed, 55 insertions(+), 52 deletions(-) diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 1eb96c0..d61a3fb 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -215,10 +215,11 @@ config USB_EHCI_SH If you use the PCI EHCI controller, this option is not necessary. config USB_EHCI_S5P - boolean "S5P EHCI support" + tristate "EHCI support for Samsung S5P/EXYNOS SoC Series" depends on USB_EHCI_HCD && PLAT_S5P help - Enable support for the S5P SOC's on-chip EHCI controller. + Enable support for the Samsung S5Pxxxx and Exynos3/4/5 SOC's + on-chip EHCI controller. config USB_EHCI_MV bool "EHCI support for Marvell on-chip controller" diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index 7e40be2..36172b7 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -29,6 +29,7 @@ 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_EHCI_HCD_AT91) += ehci-atmel.o +obj-$(CONFIG_USB_EHCI_S5P) += ehci-s5p.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 7db559d..15b298b 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -1313,11 +1313,6 @@ MODULE_LICENSE ("GPL"); #define PLATFORM_DRIVER tegra_ehci_driver #endif -#ifdef CONFIG_USB_EHCI_S5P -#include "ehci-s5p.c" -#define PLATFORM_DRIVER s5p_ehci_driver -#endif - #ifdef CONFIG_SPARC_LEON #include "ehci-grlib.c" #define PLATFORM_DRIVER ehci_grlib_driver @@ -1339,6 +1334,7 @@ MODULE_LICENSE ("GPL"); !IS_ENABLED(CONFIG_USB_EHCI_MXC) && \ !IS_ENABLED(CONFIG_PLAT_SPEAR) && \ !IS_ENABLED(CONFIG_ARCH_AT91) && \ + !IS_ENABLED(CONFIG_USB_EHCI_S5P) && \ !defined(PLATFORM_DRIVER) && \ !defined(PS3_SYSTEM_BUS_DRIVER) && \ !defined(OF_PLATFORM_DRIVER) && \ diff --git a/drivers/usb/host/ehci-s5p.c b/drivers/usb/host/ehci-s5p.c index 20ebf6a..40cfeb7 100644 --- a/drivers/usb/host/ehci-s5p.c +++ b/drivers/usb/host/ehci-s5p.c @@ -13,13 +13,24 @@ */ #include +#include +#include +#include +#include #include -#include #include +#include #include #include #include #include +#include +#include +#include + +#include "ehci.h" + +#define DRIVER_DESC "EHCI s5p driver" #define EHCI_INSNREG00(base) (base + 0x90) #define EHCI_INSNREG00_ENA_INCR16 (0x1 << 25) @@ -30,6 +41,9 @@ (EHCI_INSNREG00_ENA_INCR16 | EHCI_INSNREG00_ENA_INCR8 | \ EHCI_INSNREG00_ENA_INCR4 | EHCI_INSNREG00_ENA_INCRX_ALIGN) +static const char hcd_name[] = "ehci-s5p"; +static struct hc_driver __read_mostly s5p_ehci_hc_driver; + struct s5p_ehci_hcd { struct device *dev; struct usb_hcd *hcd; @@ -39,37 +53,6 @@ struct s5p_ehci_hcd { struct s5p_ehci_platdata *pdata; }; -static const struct hc_driver s5p_ehci_hc_driver = { - .description = hcd_name, - .product_desc = "S5P EHCI Host Controller", - .hcd_priv_size = sizeof(struct ehci_hcd), - - .irq = ehci_irq, - .flags = HCD_MEMORY | HCD_USB2, - - .reset = ehci_setup, - .start = ehci_run, - .stop = ehci_stop, - .shutdown = ehci_shutdown, - - .get_frame_number = ehci_get_frame, - - .urb_enqueue = ehci_urb_enqueue, - .urb_dequeue = ehci_urb_dequeue, - .endpoint_disable = ehci_endpoint_disable, - .endpoint_reset = ehci_endpoint_reset, - - .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 void s5p_ehci_phy_enable(struct s5p_ehci_hcd *s5p_ehci) { struct platform_device *pdev = to_platform_device(s5p_ehci->dev); @@ -114,7 +97,6 @@ static int s5p_ehci_probe(struct platform_device *pdev) { struct s5p_ehci_platdata *pdata = pdev->dev.platform_data; struct s5p_ehci_hcd *s5p_ehci; - struct usb_hcd *hcd; struct ehci_hcd *ehci; struct resource *res; struct usb_phy *phy; @@ -154,14 +136,13 @@ static int s5p_ehci_probe(struct platform_device *pdev) s5p_ehci->dev = &pdev->dev; - hcd = usb_create_hcd(&s5p_ehci_hc_driver, &pdev->dev, + s5p_ehci->hcd = usb_create_hcd(&s5p_ehci_hc_driver, &pdev->dev, dev_name(&pdev->dev)); - if (!hcd) { + if (!s5p_ehci->hcd) { dev_err(&pdev->dev, "Unable to create HCD\n"); return -ENOMEM; } - s5p_ehci->hcd = hcd; s5p_ehci->clk = devm_clk_get(&pdev->dev, "usbhost"); if (IS_ERR(s5p_ehci->clk)) { @@ -181,10 +162,10 @@ static int s5p_ehci_probe(struct platform_device *pdev) goto fail_io; } - hcd->rsrc_start = res->start; - hcd->rsrc_len = resource_size(res); - hcd->regs = devm_ioremap(&pdev->dev, res->start, hcd->rsrc_len); - if (!hcd->regs) { + s5p_ehci->hcd->rsrc_start = res->start; + s5p_ehci->hcd->rsrc_len = resource_size(res); + s5p_ehci->hcd->regs = devm_ioremap(&pdev->dev, res->start, s5p_ehci->hcd->rsrc_len); + if (!s5p_ehci->hcd->regs) { dev_err(&pdev->dev, "Failed to remap I/O memory\n"); err = -ENOMEM; goto fail_io; @@ -202,13 +183,13 @@ static int s5p_ehci_probe(struct platform_device *pdev) s5p_ehci_phy_enable(s5p_ehci); - ehci = hcd_to_ehci(hcd); - ehci->caps = hcd->regs; + ehci = hcd_to_ehci(s5p_ehci->hcd); + ehci->caps = s5p_ehci->hcd->regs; /* DMA burst Enable */ - writel(EHCI_INSNREG00_ENABLE_DMA_BURST, EHCI_INSNREG00(hcd->regs)); + writel(EHCI_INSNREG00_ENABLE_DMA_BURST, EHCI_INSNREG00(s5p_ehci->hcd->regs)); - err = usb_add_hcd(hcd, irq, IRQF_SHARED); + err = usb_add_hcd(s5p_ehci->hcd, irq, IRQF_SHARED); if (err) { dev_err(&pdev->dev, "Failed to add USB HCD\n"); goto fail_add_hcd; @@ -223,7 +204,7 @@ fail_add_hcd: fail_io: clk_disable_unprepare(s5p_ehci->clk); fail_clk: - usb_put_hcd(hcd); + usb_put_hcd(s5p_ehci->hcd); return err; } @@ -322,5 +303,29 @@ static struct platform_driver s5p_ehci_driver = { .of_match_table = of_match_ptr(exynos_ehci_match), } }; +static const struct ehci_driver_overrides s5p_overrides __initdata = { + .extra_priv_size = sizeof(struct s5p_ehci_hcd), +}; + +static int __init ehci_s5p_init(void) +{ + if (usb_disabled()) + return -ENODEV; + + pr_info("%s: " DRIVER_DESC "\n", hcd_name); + ehci_init_driver(&s5p_ehci_hc_driver, &s5p_overrides); + return platform_driver_register(&s5p_ehci_driver); +} +module_init(ehci_s5p_init); + +static void __exit ehci_s5p_cleanup(void) +{ + platform_driver_unregister(&s5p_ehci_driver); +} +module_exit(ehci_s5p_cleanup); +MODULE_DESCRIPTION(DRIVER_DESC); MODULE_ALIAS("platform:s5p-ehci"); +MODULE_AUTHOR("Jingoo Han"); +MODULE_AUTHOR("Joonyoung Shim"); +MODULE_LICENSE("GPL v2");