Skip to contentSkip to conversation

USB: EHCI: make ehci-spear a separate driver

PATCH In review manjunath.goudar at linaro.org 4 participants 12 messages Feb 10, 2013 – Feb 11, 2013 1 message not in the archive

Subsystems (3)
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): 1360522697-22902-1-git-send-email-y

#1 lore raw

PATCH 1/8 USB: EHCI: make ehci-spear a separate driver

From: Manjunath Goudar <[email protected]>

Separate the Spear host controller driver from ehci-hcd host code into its own driver module.

Cc Greg KH <[email protected]>
Cc Alan Stern <[email protected]>
Cc Viresh Kumar <[email protected]>
Cc Shiraz Hashim <[email protected]>
Cc linux-usb at vger.kernel.org
Cc spear-devel at list.st.com
---
 drivers/usb/host/Kconfig      |    8 +++
 drivers/usb/host/Makefile     |    2 +-
 drivers/usb/host/ehci-hcd.c   |    8 +--
 drivers/usb/host/ehci-spear.c |  131 +++++++++++++++++++++--------------------
 4 files changed, 78 insertions(+), 71 deletions(-)
drivers/usb/host/Kconfig +8 -0
index 3a21c5d..15e8032 100644
@@ -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
drivers/usb/host/Makefile +1 -1
index 001fbff..c8fcde9 100644
@@ -27,7 +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
 obj-$(CONFIG_USB_ISP1362_HCD)	+= isp1362-hcd.o
drivers/usb/host/ehci-hcd.c +2 -6
index b416a3f..be7247b 100644
@@ -1274,7 +1274,7 @@ MODULE_LICENSE ("GPL");
 
 #ifdef CONFIG_PLAT_ORION
 #include "ehci-orion.c"
-#define	PLATFORM_DRIVER		ehci_orion_driver
+#define        PLATFORM_DRIVER         ehci_orion_driver
 #endif
 
 #ifdef CONFIG_USB_W90X900_EHCI
@@ -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
@@ -1347,6 +1342,7 @@ MODULE_LICENSE ("GPL");
 	!IS_ENABLED(CONFIG_USB_CHIPIDEA_HOST) && \
 	!IS_ENABLED(CONFIG_USB_EHCI_MXC) && \
 	!defined(PLATFORM_DRIVER) && \
+	!IS_ENABLED(CONFIG_PLAT_SPEAR) && \
 	!defined(PS3_SYSTEM_BUS_DRIVER) && \
 	!defined(OF_PLATFORM_DRIVER) && \
 	!defined(XILINX_OF_PLATFORM_DRIVER)
drivers/usb/host/ehci-spear.c +67 -64

230 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 1/8 USB: EHCI: make ehci-spear a separate driver

Quoted 3 lines · On Mon, Feb 11, 2013 at 12:28 AM, <[email protected]> wrote:

From: Manjunath Goudar <[email protected]>

Separate the Spear host controller driver from ehci-hcd host code

SPEAr

Quoted 54 lines

into its own driver module.

Cc Greg KH <[email protected]>
Cc Alan Stern <[email protected]>
Cc Viresh Kumar <[email protected]>
Cc Shiraz Hashim <[email protected]>
Cc linux-usb at vger.kernel.org
Cc spear-devel at list.st.com
---
 drivers/usb/host/Kconfig      |    8 +++
 drivers/usb/host/Makefile     |    2 +-
 drivers/usb/host/ehci-hcd.c   |    8 +--
 drivers/usb/host/ehci-spear.c |  131 +++++++++++++++++++++--------------------
 4 files changed, 78 insertions(+), 71 deletions(-)
drivers/usb/host/Kconfig +8 -0
index 3a21c5d..15e8032 100644
@@ -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
drivers/usb/host/Makefile +1 -1
index 001fbff..c8fcde9 100644
@@ -27,7 +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
 obj-$(CONFIG_USB_ISP1362_HCD)  += isp1362-hcd.o
drivers/usb/host/ehci-hcd.c +0 -0
index b416a3f..be7247b 100644

drivers/usb/host/ehci-hcd.c MODULE_LICENSE ("GPL"); · line 1278

Quoted 6 lines
drivers/usb/host/ehci-hcd.c +1 -1
@@ -1274,7 +1274,7 @@ MODULE_LICENSE ("GPL");
 
 #ifdef CONFIG_PLAT_ORION
 #include "ehci-orion.c"
-#define        PLATFORM_DRIVER         ehci_orion_driver
+#define        PLATFORM_DRIVER         ehci_orion_driver
 #endif

Looks to be unrelated change.

Quoted 46 lines
drivers/usb/host/ehci-hcd.c +1 -5
 #ifdef CONFIG_USB_W90X900_EHCI
@@ -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
@@ -1347,6 +1342,7 @@ MODULE_LICENSE ("GPL");
        !IS_ENABLED(CONFIG_USB_CHIPIDEA_HOST) && \
        !IS_ENABLED(CONFIG_USB_EHCI_MXC) && \
        !defined(PLATFORM_DRIVER) && \
+       !IS_ENABLED(CONFIG_PLAT_SPEAR) && \
        !defined(PS3_SYSTEM_BUS_DRIVER) && \
        !defined(OF_PLATFORM_DRIVER) && \
        !defined(XILINX_OF_PLATFORM_DRIVER)
drivers/usb/host/ehci-spear.c +6 -1
index 466c1bb..0d9ed11 100644
@@ -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 <[email protected]>
@@ -12,29 +12,41 @@
 */
 
 #include <linux/clk.h>
+#include <linux/dma-mapping.h>
+#include <linux/io.h>
 #include <linux/jiffies.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
+#include <linux/usb.h>

drivers/usb/host/ehci-spear.c line 32

Quoted 10 lines
drivers/usb/host/ehci-spear.c +8 -1
+#include <linux/usb/hcd.h>
 
-struct spear_ehci {
+#include "ehci.h"
+
+#define DRIVER_DESC "EHCI SPEAr driver"
+
+static const char hcd_name[] = "ehci-SPEAr";
+
+struct SPEAr_ehci {

That's what i wrote in my comment on first patch:

"Please write spear as SPEAr everywhere, leaving
functions/variables/config options."

And so i haven't expected SPEAr into structure/function names :)

drivers/usb/host/ehci-spear.c line 37

Quoted 6 lines
drivers/usb/host/ehci-spear.c +1 -1
        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)

ditto

drivers/usb/host/ehci-spear.c line 39

Quoted 3 lines
drivers/usb/host/ehci-spear.c +1 -1
-static void spear_start_ehci(struct spear_ehci *ehci)
+static void SPEAr_start_ehci(struct SPEAr_ehci *ehci)

ditto

drivers/usb/host/ehci-spear.c line 44

Quoted 6 lines
drivers/usb/host/ehci-spear.c +1 -1
 {
        clk_prepare_enable(ehci->clk);
 }
 
-static void spear_stop_ehci(struct spear_ehci *ehci)
+static void SPEAr_stop_ehci(struct SPEAr_ehci *ehci)

ditto

drivers/usb/host/ehci-spear.c line 49

Quoted 6 lines
drivers/usb/host/ehci-spear.c +1 -1
 {
        clk_disable_unprepare(ehci->clk);
 }
 
-static int ehci_spear_setup(struct usb_hcd *hcd)
+static int ehci_SPEAr_setup(struct usb_hcd *hcd)

ditto

Quoted 32 lines
drivers/usb/host/ehci-spear.c +0 -25
 {
        struct ehci_hcd *ehci = hcd_to_ehci(hcd);
 
@@ -43,43 +55,10 @@ 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,
-

drivers/usb/host/ehci-spear.c static int ehci_spear_setup(struct usb_hcd *hcd) · line 58

Quoted 10 lines
drivers/usb/host/ehci-spear.c +1 -9
-       /* 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;

ditto

drivers/usb/host/ehci-spear.c static int ehci_spear_setup(struct usb_hcd *hcd) · line 61

Quoted 4 lines
drivers/usb/host/ehci-spear.c +1 -1
 #ifdef CONFIG_PM
-static int ehci_spear_drv_suspend(struct device *dev)
+static int ehci_SPEAr_drv_suspend(struct device *dev)

ditto

drivers/usb/host/ehci-spear.c static int ehci_spear_drv_suspend(struct device *dev) · line 69

Quoted 9 lines
drivers/usb/host/ehci-spear.c +1 -1
 {
        struct usb_hcd *hcd = dev_get_drvdata(dev);
        bool do_wakeup = device_may_wakeup(dev);
@@ -87,7 +66,7 @@ static int ehci_spear_drv_suspend(struct device *dev)
        return ehci_suspend(hcd, do_wakeup);
 }
 
-static int ehci_spear_drv_resume(struct device *dev)
+static int ehci_SPEAr_drv_resume(struct device *dev)

ditto

drivers/usb/host/ehci-spear.c static int ehci_spear_drv_resume(struct device *dev) · line 79

Quoted 11 lines
drivers/usb/host/ehci-spear.c +2 -2
 {
        struct usb_hcd *hcd = dev_get_drvdata(dev);
 
@@ -96,18 +75,18 @@ static int ehci_spear_drv_resume(struct device *dev)
 }
 #endif /* CONFIG_PM */
 
-static SIMPLE_DEV_PM_OPS(ehci_spear_pm_ops, ehci_spear_drv_suspend,
-               ehci_spear_drv_resume);
+static SIMPLE_DEV_PM_OPS(ehci_SPEAr_pm_ops, ehci_SPEAr_drv_suspend,
+               ehci_SPEAr_drv_resume);

ditto

drivers/usb/host/ehci-spear.c static int ehci_spear_drv_resume(struct device *dev) · line 81

Quoted 3 lines
drivers/usb/host/ehci-spear.c +1 -1
-static u64 spear_ehci_dma_mask = DMA_BIT_MASK(32);
+static u64 SPEAr_ehci_dma_mask = DMA_BIT_MASK(32);

ditto

drivers/usb/host/ehci-spear.c static int ehci_spear_drv_resume(struct device *dev) · line 83

Quoted 3 lines
drivers/usb/host/ehci-spear.c +1 -1
-static int spear_ehci_hcd_drv_probe(struct platform_device *pdev)
+static int SPEAr_ehci_hcd_drv_probe(struct platform_device *pdev)

ditto

drivers/usb/host/ehci-spear.c static int ehci_spear_drv_resume(struct device *dev) · line 86

Quoted 4 lines
drivers/usb/host/ehci-spear.c +1 -1
 {
        struct usb_hcd *hcd ;
-       struct spear_ehci *ehci;
+       struct SPEAr_ehci *ehci;

ditto

drivers/usb/host/ehci-spear.c static int ehci_spear_drv_resume(struct device *dev) · line 89

Quoted 4 lines
drivers/usb/host/ehci-spear.c +1 -1
        struct resource *res;
        struct clk *usbh_clk;
-       const struct hc_driver *driver = &ehci_spear_hc_driver;
+       const struct hc_driver *driver = &ehci_SPEAr_hc_driver;

ditto

drivers/usb/host/ehci-spear.c static int spear_ehci_hcd_drv_probe(struct platform_device *pdev) · line 107

Quoted 9 lines
drivers/usb/host/ehci-spear.c +1 -1
        int irq, retval;
 
        if (usb_disabled())
@@ -125,7 +104,7 @@ static int spear_ehci_hcd_drv_probe(struct platform_device *pdev)
         * Once we have dma capability bindings this can go away.
         */
        if (!pdev->dev.dma_mask)
-               pdev->dev.dma_mask = &spear_ehci_dma_mask;
+               pdev->dev.dma_mask = &SPEAr_ehci_dma_mask;

ditto

drivers/usb/host/ehci-spear.c static int spear_ehci_hcd_drv_probe(struct platform_device *pdev) · line 143

Quoted 9 lines
drivers/usb/host/ehci-spear.c +1 -1
        usbh_clk = devm_clk_get(&pdev->dev, NULL);
        if (IS_ERR(usbh_clk)) {
@@ -161,10 +140,10 @@ static int spear_ehci_hcd_drv_probe(struct platform_device *pdev)
                goto err_put_hcd;
        }
 
-       ehci = (struct spear_ehci *)hcd_to_ehci(hcd);
+       ehci = (struct SPEAr_ehci *)hcd_to_ehci(hcd);

ditto

drivers/usb/host/ehci-spear.c static int spear_ehci_hcd_drv_probe(struct platform_device *pdev) · line 146

Quoted 4 lines
drivers/usb/host/ehci-spear.c +1 -1
        ehci->clk = usbh_clk;
 
-       spear_start_ehci(ehci);
+       SPEAr_start_ehci(ehci);

ditto

drivers/usb/host/ehci-spear.c static int spear_ehci_hcd_drv_probe(struct platform_device *pdev) · line 154

Quoted 9 lines
drivers/usb/host/ehci-spear.c +1 -1
        retval = usb_add_hcd(hcd, irq, IRQF_SHARED);
        if (retval)
                goto err_stop_ehci;
@@ -172,7 +151,7 @@ static int spear_ehci_hcd_drv_probe(struct platform_device *pdev)
        return retval;
 
 err_stop_ehci:
-       spear_stop_ehci(ehci);
+       SPEAr_stop_ehci(ehci);

ditto

drivers/usb/host/ehci-spear.c fail: · line 163

Quoted 9 lines
drivers/usb/host/ehci-spear.c +1 -1
 err_put_hcd:
        usb_put_hcd(hcd);
 fail:
@@ -181,10 +160,10 @@ fail:
        return retval ;
 }
 
-static int spear_ehci_hcd_drv_remove(struct platform_device *pdev)
+static int SPEAr_ehci_hcd_drv_remove(struct platform_device *pdev)

ditto

drivers/usb/host/ehci-spear.c fail: · line 166

Quoted 4 lines
drivers/usb/host/ehci-spear.c +1 -1
 {
        struct usb_hcd *hcd = platform_get_drvdata(pdev);
-       struct spear_ehci *ehci_p = to_spear_ehci(hcd);
+       struct SPEAr_ehci *ehci_p = to_SPEAr_ehci(hcd);

ditto

drivers/usb/host/ehci-spear.c static int spear_ehci_hcd_drv_remove(struct platform_device *pdev) · line 175

Quoted 9 lines
drivers/usb/host/ehci-spear.c +1 -1
        if (!hcd)
                return 0;
@@ -193,27 +172,51 @@ static int spear_ehci_hcd_drv_remove(struct platform_device *pdev)
        usb_remove_hcd(hcd);
 
        if (ehci_p->clk)
-               spear_stop_ehci(ehci_p);
+               SPEAr_stop_ehci(ehci_p);

ditto

drivers/usb/host/ehci-spear.c static int spear_ehci_hcd_drv_remove(struct platform_device *pdev) · line 181

Quoted 8 lines
drivers/usb/host/ehci-spear.c +1 -2
        usb_put_hcd(hcd);
 
        return 0;
 }
 
-static struct of_device_id spear_ehci_id_table[] = {
-       { .compatible = "st,spear600-ehci", },
+static struct of_device_id SPEAr_ehci_id_table[] = {

ditto

drivers/usb/host/ehci-spear.c static int spear_ehci_hcd_drv_remove(struct platform_device *pdev) · line 182

Quoted 1 line
drivers/usb/host/ehci-spear.c +1 -0
+       { .compatible = "st,SPEAr600-ehci", },

ditto

drivers/usb/host/ehci-spear.c static int spear_ehci_hcd_drv_remove(struct platform_device *pdev) · line 188

Quoted 9 lines
drivers/usb/host/ehci-spear.c +3 -3
        { },
 };
 
-static struct platform_driver spear_ehci_hcd_driver = {
-       .probe          = spear_ehci_hcd_drv_probe,
-       .remove         = spear_ehci_hcd_drv_remove,
+static struct platform_driver SPEAr_ehci_hcd_driver = {
+       .probe          = SPEAr_ehci_hcd_drv_probe,
+       .remove         = SPEAr_ehci_hcd_drv_remove,

ditto

drivers/usb/host/ehci-spear.c static int spear_ehci_hcd_drv_remove(struct platform_device *pdev) · line 194

Quoted 9 lines
drivers/usb/host/ehci-spear.c +3 -3
        .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),
+               .pm = &ehci_SPEAr_pm_ops,
+               .of_match_table = of_match_ptr(SPEAr_ehci_id_table),

ditto

drivers/usb/host/ehci-spear.c static int spear_ehci_hcd_drv_remove(struct platform_device *pdev) · line 200

Quoted 7 lines
drivers/usb/host/ehci-spear.c +3 -1
        }
 };
 
-MODULE_ALIAS("platform:spear-ehci");
+
+static const struct ehci_driver_overrides SPEAr_overrides __initdata = {
+       .reset = ehci_SPEAr_setup,

ditto

Quoted 9 lines
drivers/usb/host/ehci-spear.c +9 -0
+};
+
+static int __init ehci_SPEAr_init(void)
+{
+       if (usb_disabled())
+               return -ENODEV;
+
+       pr_info("%s: " DRIVER_DESC "\n", hcd_name);
+

drivers/usb/host/ehci-spear.c static int spear_ehci_hcd_drv_remove(struct platform_device *pdev) · line 219

Quoted 10 lines
drivers/usb/host/ehci-spear.c +10 -0
+       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);

Everywhere else too :(

#3 lore raw

PATCH 1/8 USB: EHCI: make ehci-spear a separate driver

In reply to manjunath.goudar at linaro.org

Hello,

[...]

drivers/usb/host/ehci-spear.c static int spear_ehci_hcd_drv_remove(struct platform_device *pdev) · line 184

Quoted 6 lines
drivers/usb/host/ehci-spear.c +2 -2
-static struct of_device_id spear_ehci_id_table[] = {
-       { .compatible = "st,spear600-ehci", },
+static struct of_device_id SPEAr_ehci_id_table[] = {
+       { .compatible = "st,SPEAr600-ehci", },
        { },
 };

This will break anyone using the documented binding, and anyone with an existing dt will suddenly find their usb support broken.

Please don't change this.

Thanks,
Mark.

#4 lore raw

PATCH 2/8 USB: EHCI: make ehci-atmel a separate driver

In reply to a message not in the archive

From: Manjunath Goudar <[email protected]>

Separate the Atmel host controller driver from ehci-hcd host code into its own driver module.

Cc Alan Stern <[email protected]>
Cc Greg KH <[email protected]>
Cc Grant Likely <[email protected]>
Cc Rob Herring <[email protected]>
Cc Andrew Victor <[email protected]>
Cc Nicolas Ferre <[email protected]>
Cc Jean-Christophe Plagniol-Villard <[email protected]>
Cc linux-usb at vger.kernel.org
Cc linux-kernel at vger.kernel.org
---
 drivers/usb/host/Kconfig      |    8 +++++
 drivers/usb/host/Makefile     |    1 +
 drivers/usb/host/ehci-atmel.c |   77 ++++++++++++++++++++++-------------------
 drivers/usb/host/ehci-hcd.c   |   10 ++----
 drivers/usb/host/ehci.h       |    2 +-
 5 files changed, 54 insertions(+), 44 deletions(-)
drivers/usb/host/Kconfig +8 -0
index 15e8032..1ef37d7 100644
@@ -170,6 +170,14 @@ config USB_EHCI_HCD_SPEAR
           Enables support for the on-chip EHCI controller on
           ST SPEAr chips.
 
+config USB_EHCI_HCD_AT91
+        tristate  "Support for Atmel on-chip EHCI USB controller"
+        depends on USB_EHCI_HCD && ARCH_AT91
+        default y
+        ---help---
+          Enables support for the on-chip EHCI controller on
+          Atmel chips.
+
 config USB_EHCI_MSM
 	bool "Support for MSM on-chip EHCI USB controller"
 	depends on USB_EHCI_HCD && ARCH_MSM
drivers/usb/host/Makefile +1 -0
index c8fcde9..b301243 100644
@@ -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_OXU210HP_HCD)	+= oxu210hp-hcd.o
+obj-$(CONFIG_USB_EHCI_HCD_AT91) += ehci-atmel.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
drivers/usb/host/ehci-atmel.c +41 -36

95 lines not on this page · raw message

drivers/usb/host/ehci-hcd.c +3 -7
index be7247b..08e9fdf 100644
@@ -352,7 +352,7 @@ static void ehci_silence_controller(struct ehci_hcd *ehci)
  * This forcibly disables dma and IRQs, helping kexec and other cases
  * where the next system software may expect clean state.
  */
-static void ehci_shutdown(struct usb_hcd *hcd)
+void ehci_shutdown(struct usb_hcd *hcd)
 {
 	struct ehci_hcd	*ehci = hcd_to_ehci(hcd);
 
@@ -366,7 +366,7 @@ static void ehci_shutdown(struct usb_hcd *hcd)
 
 	hrtimer_cancel(&ehci->hrtimer);
 }
-
+EXPORT_SYMBOL_GPL(ehci_shutdown);
 /*-------------------------------------------------------------------------*/
 
 /*
@@ -1282,11 +1282,6 @@ MODULE_LICENSE ("GPL");
 #define	PLATFORM_DRIVER		ehci_hcd_w90x900_driver
 #endif
 
-#ifdef CONFIG_ARCH_AT91
-#include "ehci-atmel.c"
-#define	PLATFORM_DRIVER		ehci_atmel_driver
-#endif
-
 #ifdef CONFIG_USB_OCTEON_EHCI
 #include "ehci-octeon.c"
 #define PLATFORM_DRIVER		ehci_octeon_driver
@@ -1343,6 +1338,7 @@ MODULE_LICENSE ("GPL");
 	!IS_ENABLED(CONFIG_USB_EHCI_MXC) && \
 	!defined(PLATFORM_DRIVER) && \
 	!IS_ENABLED(CONFIG_PLAT_SPEAR) && \
+	!IS_ENABLED(CONFIG_ARCH_AT91) && \
 	!defined(PS3_SYSTEM_BUS_DRIVER) && \
 	!defined(OF_PLATFORM_DRIVER) && \
 	!defined(XILINX_OF_PLATFORM_DRIVER)
drivers/usb/host/ehci.h +1 -1
index 36c3a82..593d3bb 100644
@@ -798,7 +798,7 @@ struct ehci_driver_overrides {
 extern void	ehci_init_driver(struct hc_driver *drv,
 				const struct ehci_driver_overrides *over);
 extern int	ehci_setup(struct usb_hcd *hcd);
-
+extern void ehci_shutdown(struct usb_hcd *hcd);
 #ifdef CONFIG_PM
 extern int	ehci_suspend(struct usb_hcd *hcd, bool do_wakeup);
 extern int	ehci_resume(struct usb_hcd *hcd, bool hibernated);
Signature · 1 line
1.7.9.5
#5 lore raw

PATCH 3/8 USB: EHCI: make ehci-s5p a separate driver

In reply to a message not in the archive

From: Manjunath Goudar <[email protected]>

Separate the s5p host controller driver from ehci-hcd host code into its own driver module.

Cc Greg KH <[email protected]>
Cc Alan Stern <[email protected]>
Cc Kukjin Kim <[email protected]>
Cc Kyungmin Park <[email protected]>
Cc Grant Likely <[email protected]>
Cc Rob Herring <[email protected]>
Cc linux-usb at vger.kernel.org
---
 drivers/usb/host/Kconfig    |    2 +-
 drivers/usb/host/Makefile   |    1 +
 drivers/usb/host/ehci-hcd.c |    6 +---
 drivers/usb/host/ehci-s5p.c |   69 ++++++++++++++++++++++++-------------------
 4 files changed, 41 insertions(+), 37 deletions(-)
drivers/usb/host/Kconfig +1 -1
index 1ef37d7..8ffbafa 100644
@@ -215,7 +215,7 @@ 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 "S5P EHCI support"
        depends on USB_EHCI_HCD && PLAT_S5P
        help
 	 Enable support for the S5P SOC's on-chip EHCI controller.
drivers/usb/host/Makefile +1 -0
index b301243..77e0331 100644
@@ -30,6 +30,7 @@ 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_EHCI_HCD_AT91) += ehci-atmel.o
+obj-$(CONFIG_USB_EHCI_S5P)      += ehci-s5p.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
drivers/usb/host/ehci-hcd.c +1 -5
index 08e9fdf..22c50fb 100644
@@ -1307,11 +1307,6 @@ MODULE_LICENSE ("GPL");
 #define	PLATFORM_DRIVER		ehci_hcd_msp_driver
 #endif
 
-#ifdef CONFIG_USB_EHCI_TEGRA
-#include "ehci-tegra.c"
-#define PLATFORM_DRIVER		tegra_ehci_driver
-#endif
-
 #ifdef CONFIG_USB_EHCI_S5P
 #include "ehci-s5p.c"
 #define PLATFORM_DRIVER		s5p_ehci_driver
@@ -1339,6 +1334,7 @@ MODULE_LICENSE ("GPL");
 	!defined(PLATFORM_DRIVER) && \
 	!IS_ENABLED(CONFIG_PLAT_SPEAR) && \
 	!IS_ENABLED(CONFIG_ARCH_AT91) && \
+	!IS_ENABLED(CONFIG_USB_EHCI_S5P) && \
 	!defined(PS3_SYSTEM_BUS_DRIVER) && \
 	!defined(OF_PLATFORM_DRIVER) && \
 	!defined(XILINX_OF_PLATFORM_DRIVER)
drivers/usb/host/ehci-s5p.c +38 -31

91 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#6 lore raw

PATCH 3/8 USB: EHCI: make ehci-s5p a separate driver

drivers/usb/host/ehci-hcd.c MODULE_LICENSE ("GPL"); · line 1313

Quoted 11 lines · manjunath.goudar at linaro.org

From: Manjunath Goudar <[email protected]>

Separate the s5p host controller driver from ehci-hcd host code into its own driver module.

drivers/usb/host/ehci-hcd.c +0 -4
 
-#ifdef CONFIG_USB_EHCI_TEGRA
-#include "ehci-tegra.c"
-#define PLATFORM_DRIVER		tegra_ehci_driver
-#endif

That's also still wrong.

#7 lore raw

PATCH 4/8 USB: EHCI: make ehci-mv a separate driver

In reply to a message not in the archive

From: Manjunath Goudar <[email protected]>

Separate the mv(marvell) host controller driver from ehci-hcd host code into its own driver module.

Cc Greg KH <[email protected]>
Cc Alan Stern <[email protected]>
Cc Jason Cooper <[email protected]>
Cc Andrew Lunn <[email protected]>
Cc linux-usb at vger.kernel.org
Cc linux-kernel at 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(-)
drivers/usb/host/Kconfig +1 -1
index 8ffbafa..2aa4ece 100644
@@ -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---
drivers/usb/host/Makefile +1 -0
index 77e0331..d593017 100644
@@ -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
drivers/usb/host/ehci-hcd.c +1 -5
index 22c50fb..d133f6d 100644
@@ -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)
drivers/usb/host/ehci-mv.c +37 -43

100 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#8 lore raw

PATCH 5/8 USB: EHCI: make ehci-vt8500 a separate driver

In reply to a message not in the archive

From: Manjunath Goudar <[email protected]>

Separate the vt8500 host controller driver from ehci-hcd host code into its own driver module.

Cc Greg KH <[email protected]>
Cc Alan Stern <[email protected]>
Cc Tony Prisk <[email protected]>
Cc Alexey Charkov <[email protected]>
Cc linux-usb at vger.kernel.org
Cc linux-kernel at vger.kernel.org
---
 drivers/usb/host/Kconfig       |    8 +++++
 drivers/usb/host/Makefile      |    1 +
 drivers/usb/host/ehci-hcd.c    |    5 ---
 drivers/usb/host/ehci-vt8500.c |   73 ++++++++++++++++++----------------------
 4 files changed, 42 insertions(+), 45 deletions(-)
drivers/usb/host/Kconfig +8 -0
index 2aa4ece..4e15b87 100644
@@ -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_VT8500
+        tristate "Support for VT8500 on-chip EHCI USB controller"
+        depends on USB_EHCI_HCD && ARCH_VT8500
+        default y
+        ---help---
+          Enables support for the on-chip EHCI controller on
+          VT8500 chips.
+
 config USB_EHCI_HCD_SPEAR
         tristate "Support for ST SPEAr on-chip EHCI USB controller"
         depends on USB_EHCI_HCD && PLAT_SPEAR
drivers/usb/host/Makefile +1 -0
index d593017..1fe0579 100644
@@ -32,6 +32,7 @@ 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_EHCI_HCD_VT8500)+= ehci-vt8500.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
drivers/usb/host/ehci-hcd.c +0 -5
index d133f6d..3dacac0 100644
@@ -1287,11 +1287,6 @@ MODULE_LICENSE ("GPL");
 #define PLATFORM_DRIVER		ehci_octeon_driver
 #endif
 
-#ifdef CONFIG_ARCH_VT8500
-#include "ehci-vt8500.c"
-#define	PLATFORM_DRIVER		vt8500_ehci_driver
-#endif
-
 #ifdef CONFIG_USB_EHCI_MSM
 #include "ehci-msm.c"
 #define PLATFORM_DRIVER		ehci_msm_driver
drivers/usb/host/ehci-vt8500.c +33 -40

96 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#9 lore raw

PATCH 6/8 USB: EHCI: make ehci-msm a separate driver

In reply to a message not in the archive

From: Manjunath Goudar <[email protected]>

Separate the Qualcomm On-Chip host controller driver from ehci-hcd host code into its own driver module.

Cc Greg KH <[email protected]>
Cc Alan Stern <[email protected]>
Cc David Brown <[email protected]>
Cc Daniel Walker <[email protected]>
Cc Bryan Huntsman <[email protected]>
Cc Brian Swetland <[email protected]>
Cc linux-usb at vger.kernel.org
Cc linux-kernel at vger.kernel.org
---
 drivers/usb/host/Kconfig    |    4 +-
 drivers/usb/host/Makefile   |    1 +
 drivers/usb/host/ehci-hcd.c |    7 +---
 drivers/usb/host/ehci-msm.c |   85 +++++++++++++++++++------------------------
 4 files changed, 42 insertions(+), 55 deletions(-)
drivers/usb/host/Kconfig +2 -2
index 4e15b87..751290d 100644
@@ -187,7 +187,7 @@ config USB_EHCI_HCD_AT91
           Atmel chips.
 
 config USB_EHCI_MSM
-	bool "Support for MSM on-chip EHCI USB controller"
+	tristate "Support for MSM on-chip EHCI USB controller"
 	depends on USB_EHCI_HCD && ARCH_MSM
 	select USB_EHCI_ROOT_HUB_TT
 	select USB_MSM_OTG
@@ -203,7 +203,7 @@ config USB_EHCI_TEGRA
        boolean "NVIDIA Tegra HCD support"
        depends on USB_EHCI_HCD && ARCH_TEGRA
        select USB_EHCI_ROOT_HUB_TT
-       help
+      --- help---
          This driver enables support for the internal USB Host Controllers
          found in NVIDIA Tegra SoCs. The controllers are EHCI compliant.
 
drivers/usb/host/Makefile +1 -0
index 1fe0579..75d98b9 100644
@@ -33,6 +33,7 @@ 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_EHCI_HCD_VT8500)+= ehci-vt8500.o
+obj-$(CONFIG_USB_EHCI_MSM)      += ehci-msm.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
drivers/usb/host/ehci-hcd.c +2 -5
index 3dacac0..db5f0ce 100644
@@ -1287,11 +1287,6 @@ MODULE_LICENSE ("GPL");
 #define PLATFORM_DRIVER		ehci_octeon_driver
 #endif
 
-#ifdef CONFIG_USB_EHCI_MSM
-#include "ehci-msm.c"
-#define PLATFORM_DRIVER		ehci_msm_driver
-#endif
-
 #ifdef CONFIG_TILE_USB
 #include "ehci-tilegx.c"
 #define	PLATFORM_DRIVER		ehci_hcd_tilegx_driver
@@ -1326,6 +1321,8 @@ MODULE_LICENSE ("GPL");
 	!IS_ENABLED(CONFIG_ARCH_AT91) && \
 	!IS_ENABLED(CONFIG_USB_EHCI_S5P) && \
 	!IS_ENABLED(CONFIG_USB_EHCI_MV) && \
+	!IS_ENABLED(CONFIG_ARCH_VT8500) && \
+	!IS_ENABLED(CONFIG_USB_EHCI_MSM) && \
 	!defined(PS3_SYSTEM_BUS_DRIVER) && \
 	!defined(OF_PLATFORM_DRIVER) && \
 	!defined(XILINX_OF_PLATFORM_DRIVER)
drivers/usb/host/ehci-msm.c +37 -48

108 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#10 lore raw

Re: [PATCH 6/8] USB: EHCI: make ehci-msm a separate driver

drivers/usb/host/Kconfig config USB_EHCI_TEGRA · line 208

Quoted 12 lines · manjunath.goudar at linaro.org

Separate the Qualcomm On-Chip host controller driver from ehci-hcd host code

drivers/usb/host/Kconfig +1 -1
@@ -203,7 +203,7 @@ config USB_EHCI_TEGRA
        boolean "NVIDIA Tegra HCD support"
        depends on USB_EHCI_HCD && ARCH_TEGRA
        select USB_EHCI_ROOT_HUB_TT
-       help
+      --- help---
          This driver enables support for the internal USB Host Controllers
          found in NVIDIA Tegra SoCs. The controllers are EHCI compliant.

I still don't think that's correct.

#11 lore raw

PATCH 7/8 USB: EHCI: make ehci-w90X900 a separate driver

In reply to a message not in the archive

From: Manjunath Goudar <[email protected]>

Separate the Nuvoton On-Chip host controller driver from ehci-hcd host code into its own driver module.

Cc Greg KH <[email protected]>
Cc Alan Stern <[email protected]>
Cc Wan ZongShun <[email protected]>
Cc linux-usb at vger.kernel.org
Cc linux-kernel at vger.kernel.org
---
 drivers/usb/host/Kconfig        |    2 +-
 drivers/usb/host/Makefile       |    1 +
 drivers/usb/host/ehci-hcd.c     |   16 +++----
 drivers/usb/host/ehci-w90x900.c |   90 +++++++++++++++++----------------------
 4 files changed, 48 insertions(+), 61 deletions(-)
drivers/usb/host/Kconfig +1 -1
index 751290d..d1d1b09 100644
@@ -238,7 +238,7 @@ config USB_EHCI_MV
 	  only be EHCI host. OTG is controller that can switch to host mode.
 
 config USB_W90X900_EHCI
-	bool "W90X900(W90P910) EHCI support"
+	 tristate "W90X900(W90P910) EHCI support"
 	depends on USB_EHCI_HCD && ARCH_W90X900
 	---help---
 		Enables support for the W90X900 USB controller
drivers/usb/host/Makefile +1 -0
index 75d98b9..e169ba1 100644
@@ -34,6 +34,7 @@ obj-$(CONFIG_USB_EHCI_S5P)      += ehci-s5p.o
 obj-$(CONFIG_USB_EHCI_MV)       += ehci-mv.o
 obj-$(CONFIG_USB_EHCI_HCD_VT8500)+= ehci-vt8500.o
 obj-$(CONFIG_USB_EHCI_MSM)      += ehci-msm.o
+obj-$(CONFIG_USB_W90X900_EHCI)  += ehci-w90x900.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
drivers/usb/host/ehci-hcd.c +6 -10
index db5f0ce..5fab5fa 100644
@@ -1272,16 +1272,6 @@ MODULE_LICENSE ("GPL");
 #define XILINX_OF_PLATFORM_DRIVER	ehci_hcd_xilinx_of_driver
 #endif
 
-#ifdef CONFIG_PLAT_ORION
-#include "ehci-orion.c"
-#define        PLATFORM_DRIVER         ehci_orion_driver
-#endif
-
-#ifdef CONFIG_USB_W90X900_EHCI
-#include "ehci-w90x900.c"
-#define	PLATFORM_DRIVER		ehci_hcd_w90x900_driver
-#endif
-
 #ifdef CONFIG_USB_OCTEON_EHCI
 #include "ehci-octeon.c"
 #define PLATFORM_DRIVER		ehci_octeon_driver
@@ -1292,6 +1282,11 @@ MODULE_LICENSE ("GPL");
 #define	PLATFORM_DRIVER		ehci_hcd_tilegx_driver
 #endif
 
+#ifdef CONFIG_PLAT_ORION
+#include "ehci-orion.c"
+#define  PLATFORM_DRIVER         ehci_orion_driver
+#endif
+
 #ifdef CONFIG_USB_EHCI_HCD_PMC_MSP
 #include "ehci-pmcmsp.c"
 #define	PLATFORM_DRIVER		ehci_hcd_msp_driver
@@ -1323,6 +1318,7 @@ MODULE_LICENSE ("GPL");
 	!IS_ENABLED(CONFIG_USB_EHCI_MV) && \
 	!IS_ENABLED(CONFIG_ARCH_VT8500) && \
 	!IS_ENABLED(CONFIG_USB_EHCI_MSM) && \
+	!IS_ENABLED(CONFIG_USB_W90X900_EHCI) && \
 	!defined(PS3_SYSTEM_BUS_DRIVER) && \
 	!defined(OF_PLATFORM_DRIVER) && \
 	!defined(XILINX_OF_PLATFORM_DRIVER)
drivers/usb/host/ehci-w90x900.c +40 -50

117 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#12 lore raw

PATCH 8/8 USB: EHCI: make ehci-orion a separate driver

In reply to a message not in the archive

From: Manjunath Goudar <[email protected]>

Separate the Marvell Orion host controller driver from ehci-hcd host code into its own driver module.

Cc Greg KH <[email protected]>
Cc Alan Stern <[email protected]>
Cc Jason Cooper <[email protected]>
Cc Andrew Lunn <[email protected]>
Cc Russell King <[email protected]>
Cc linux-arm-kernel at lists.infradead.org
Cc linux-kernel at vger.kernel.org
---
 drivers/usb/host/Kconfig      |    8 ++++
 drivers/usb/host/Makefile     |    1 +
 drivers/usb/host/ehci-hcd.c   |    6 +--
 drivers/usb/host/ehci-orion.c |   91 +++++++++++++++++++----------------------
 4 files changed, 53 insertions(+), 53 deletions(-)
drivers/usb/host/Kconfig +8 -0
index d1d1b09..18bfbfa 100644
@@ -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_ORION
+        tristate  "Support for Marvell Orion on-chip EHCI USB controller"
+        depends on USB_EHCI_HCD && PLAT_ORION
+        default y
+        ---help---
+          Enables support for the on-chip EHCI controller on
+          Morvell Orion chips.
+
 config USB_EHCI_HCD_VT8500
         tristate "Support for VT8500 on-chip EHCI USB controller"
         depends on USB_EHCI_HCD && ARCH_VT8500
drivers/usb/host/Makefile +1 -0
index e169ba1..fe20e98 100644
@@ -35,6 +35,7 @@ obj-$(CONFIG_USB_EHCI_MV)       += ehci-mv.o
 obj-$(CONFIG_USB_EHCI_HCD_VT8500)+= ehci-vt8500.o
 obj-$(CONFIG_USB_EHCI_MSM)      += ehci-msm.o
 obj-$(CONFIG_USB_W90X900_EHCI)  += ehci-w90x900.o
+obj-$(CONFIG_USB_EHCI_HCD_ORION)+= ehci-orion.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
drivers/usb/host/ehci-hcd.c +1 -5
index 5fab5fa..4c2a795 100644
@@ -1282,11 +1282,6 @@ MODULE_LICENSE ("GPL");
 #define	PLATFORM_DRIVER		ehci_hcd_tilegx_driver
 #endif
 
-#ifdef CONFIG_PLAT_ORION
-#include "ehci-orion.c"
-#define  PLATFORM_DRIVER         ehci_orion_driver
-#endif
-
 #ifdef CONFIG_USB_EHCI_HCD_PMC_MSP
 #include "ehci-pmcmsp.c"
 #define	PLATFORM_DRIVER		ehci_hcd_msp_driver
@@ -1319,6 +1314,7 @@ MODULE_LICENSE ("GPL");
 	!IS_ENABLED(CONFIG_ARCH_VT8500) && \
 	!IS_ENABLED(CONFIG_USB_EHCI_MSM) && \
 	!IS_ENABLED(CONFIG_USB_W90X900_EHCI) && \
+	!IS_ENABLED(CONFIG_PLAT_ORION) && \
 	!defined(PS3_SYSTEM_BUS_DRIVER) && \
 	!defined(OF_PLATFORM_DRIVER) && \
 	!defined(XILINX_OF_PLATFORM_DRIVER)
drivers/usb/host/ehci-orion.c +43 -48

122 lines not on this page · raw message

Signature · 1 line
1.7.9.5