USB: OHCI: make ohci-exynos a separate driver

Separate the  Samsung OHCI EXYNOS host controller driver from ohci-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.

Signed-off-by: Manjunath Goudar <manjunath.goudar@linaro.org>
Signed-off-by: Deepak Saxena <dsaxena@linaro.org>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Acked-by: Jingoo Han <jg1.han@samsung.com>
Cc: Vivek Gautam <gautam.vivek@samsung.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

4 files changed, 72 insertions, 118 deletions

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 7e7c52a081ad..d8d39c7846c7 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -454,8 +454,8 @@ config USB_OHCI_SH
           If you use the PCI OHCI controller, this option is not necessary.
 
 config USB_OHCI_EXYNOS
-        boolean "OHCI support for Samsung EXYNOS SoC Series"
-        depends on ARCH_EXYNOS
+        tristate "OHCI support for Samsung S5P/EXYNOS SoC Series"
+        depends on PLAT_S5P || ARCH_EXYNOS
         help
          Enable support for the Samsung Exynos SOC's on-chip OHCI controller.
 
diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
index 29fa3b839d85..78ace5517896 100644
--- a/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
@@ -47,6 +47,7 @@ obj-$(CONFIG_USB_ISP1362_HCD)	+= isp1362-hcd.o
 obj-$(CONFIG_USB_OHCI_HCD)      += ohci-hcd.o
 obj-$(CONFIG_USB_OHCI_HCD_PCI)  += ohci-pci.o
 obj-$(CONFIG_USB_OHCI_HCD_PLATFORM)     += ohci-platform.o
+obj-$(CONFIG_USB_OHCI_EXYNOS)   += ohci-exynos.o
 
 obj-$(CONFIG_USB_UHCI_HCD)      += uhci-hcd.o
 obj-$(CONFIG_USB_FHCI_HCD)      += fhci.o
diff --git a/drivers/usb/host/ohci-exynos.c b/drivers/usb/host/ohci-exynos.c
index dc6ee9adacf5..3e4bc74f76ab 100644
--- a/drivers/usb/host/ohci-exynos.c
+++ b/drivers/usb/host/ohci-exynos.c
@@ -12,24 +12,39 @@
  */
 
 #include <linux/clk.h>
+#include <linux/dma-mapping.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/platform_data/usb-ohci-exynos.h>
 #include <linux/usb/phy.h>
 #include <linux/usb/samsung_usb_phy.h>
+#include <linux/usb.h>
+#include <linux/usb/hcd.h>
+#include <linux/usb/otg.h>
+
+#include "ohci.h"
+
+#define DRIVER_DESC "OHCI EXYNOS driver"
+
+static const char hcd_name[] = "ohci-exynos";
+static struct hc_driver __read_mostly exynos_ohci_hc_driver;
+
+#define to_exynos_ohci(hcd) (struct exynos_ohci_hcd *)(hcd_to_ohci(hcd)->priv)
 
 struct exynos_ohci_hcd {
-        struct device *dev;
-        struct usb_hcd *hcd;
         struct clk *clk;
         struct usb_phy *phy;
         struct usb_otg *otg;
         struct exynos4_ohci_platdata *pdata;
 };
 
-static void exynos_ohci_phy_enable(struct exynos_ohci_hcd *exynos_ohci)
+static void exynos_ohci_phy_enable(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(exynos_ohci->dev);
+        struct usb_hcd *hcd = platform_get_drvdata(pdev);
+        struct exynos_ohci_hcd *exynos_ohci = to_exynos_ohci(hcd);
 
         if (exynos_ohci->phy)
                 usb_phy_init(exynos_ohci->phy);
@@ -37,9 +52,10 @@ static void exynos_ohci_phy_enable(struct exynos_ohci_hcd *exynos_ohci)
                 exynos_ohci->pdata->phy_init(pdev, USB_PHY_TYPE_HOST);
 }
 
-static void exynos_ohci_phy_disable(struct exynos_ohci_hcd *exynos_ohci)
+static void exynos_ohci_phy_disable(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(exynos_ohci->dev);
+        struct usb_hcd *hcd = platform_get_drvdata(pdev);
+        struct exynos_ohci_hcd *exynos_ohci = to_exynos_ohci(hcd);
 
         if (exynos_ohci->phy)
                 usb_phy_shutdown(exynos_ohci->phy);
@@ -47,63 +63,11 @@ static void exynos_ohci_phy_disable(struct exynos_ohci_hcd *exynos_ohci)
                 exynos_ohci->pdata->phy_exit(pdev, USB_PHY_TYPE_HOST);
 }
 
-static int ohci_exynos_reset(struct usb_hcd *hcd)
-{
-        return ohci_init(hcd_to_ohci(hcd));
-}
-
-static int ohci_exynos_start(struct usb_hcd *hcd)
-{
-        struct ohci_hcd *ohci = hcd_to_ohci(hcd);
-        int ret;
-
-        ohci_dbg(ohci, "ohci_exynos_start, ohci:%p", ohci);
-
-        ret = ohci_run(ohci);
-        if (ret < 0) {
-                dev_err(hcd->self.controller, "can't start %s\n",
-                        hcd->self.bus_name);
-                ohci_stop(hcd);
-                return ret;
-        }
-
-        return 0;
-}
-
-static const struct hc_driver exynos_ohci_hc_driver = {
-        .description            = hcd_name,
-        .product_desc           = "EXYNOS OHCI Host Controller",
-        .hcd_priv_size          = sizeof(struct ohci_hcd),
-
-        .irq                    = ohci_irq,
-        .flags                  = HCD_MEMORY|HCD_USB11,
-
-        .reset                  = ohci_exynos_reset,
-        .start                  = ohci_exynos_start,
-        .stop                   = ohci_stop,
-        .shutdown               = ohci_shutdown,
-
-        .get_frame_number       = ohci_get_frame,
-
-        .urb_enqueue            = ohci_urb_enqueue,
-        .urb_dequeue            = ohci_urb_dequeue,
-        .endpoint_disable       = ohci_endpoint_disable,
-
-        .hub_status_data        = ohci_hub_status_data,
-        .hub_control            = ohci_hub_control,
-#ifdef  CONFIG_PM
-        .bus_suspend            = ohci_bus_suspend,
-        .bus_resume             = ohci_bus_resume,
-#endif
-        .start_port_reset       = ohci_start_port_reset,
-};
-
 static int exynos_ohci_probe(struct platform_device *pdev)
 {
         struct exynos4_ohci_platdata *pdata = dev_get_platdata(&pdev->dev);
         struct exynos_ohci_hcd *exynos_ohci;
         struct usb_hcd *hcd;
-        struct ohci_hcd *ohci;
         struct resource *res;
         struct usb_phy *phy;
         int irq;
@@ -119,10 +83,14 @@ static int exynos_ohci_probe(struct platform_device *pdev)
         if (!pdev->dev.coherent_dma_mask)
                 pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
 
-        exynos_ohci = devm_kzalloc(&pdev->dev, sizeof(struct exynos_ohci_hcd),
-                                        GFP_KERNEL);
-        if (!exynos_ohci)
+        hcd = usb_create_hcd(&exynos_ohci_hc_driver,
+                                &pdev->dev, dev_name(&pdev->dev));
+        if (!hcd) {
+                dev_err(&pdev->dev, "Unable to create HCD\n");
                 return -ENOMEM;
+        }
+
+        exynos_ohci = to_exynos_ohci(hcd);