ARM: EXYNOS: Update & move usb-phy types to generic include layer

Updating the names of usb-phy types to more generic names:
USB_PHY_TYPE_DEIVCE & USB_PHY_TYPE_HOST; and further update
its dependencies.

Signed-off-by: Praveen Paneri <p.paneri@samsung.com>
Signed-off-by: Vivek Gautam <gautam.vivek@samsung.com>
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/host/ehci-s5p.c b/drivers/usb/host/ehci-s5p.c
index 319dcfaa8735f6446891984ab8af65f64d57be5b..46ca5efac82bbe21c929da059985bdad1c978503 100644 (file)
--- a/drivers/usb/host/ehci-s5p.c
+++ b/drivers/usb/host/ehci-s5p.c
@@ -17,6 +17,7 @@
 #include <linux/platform_device.h>
 #include <linux/of_gpio.h>
 #include <linux/platform_data/usb-ehci-s5p.h>
+#include <linux/usb/samsung_usb_phy.h>
 #include <plat/usb-phy.h>
 
 #define EHCI_INSNREG00(base)                   (base + 0x90)
@@ -164,7 +165,7 @@ static int s5p_ehci_probe(struct platform_device *pdev)
        }
 
        if (pdata->phy_init)
-               pdata->phy_init(pdev, S5P_USB_PHY_HOST);
+               pdata->phy_init(pdev, USB_PHY_TYPE_HOST);
 
        ehci = hcd_to_ehci(hcd);
        ehci->caps = hcd->regs;
@@ -198,7 +199,7 @@ static int s5p_ehci_remove(struct platform_device *pdev)
        usb_remove_hcd(hcd);
 
        if (pdata && pdata->phy_exit)
-               pdata->phy_exit(pdev, S5P_USB_PHY_HOST);
+               pdata->phy_exit(pdev, USB_PHY_TYPE_HOST);
 
        clk_disable_unprepare(s5p_ehci->clk);
 
@@ -229,7 +230,7 @@ static int s5p_ehci_suspend(struct device *dev)
        rc = ehci_suspend(hcd, do_wakeup);
 
        if (pdata && pdata->phy_exit)
-               pdata->phy_exit(pdev, S5P_USB_PHY_HOST);
+               pdata->phy_exit(pdev, USB_PHY_TYPE_HOST);
 
        clk_disable_unprepare(s5p_ehci->clk);
 
@@ -246,7 +247,7 @@ static int s5p_ehci_resume(struct device *dev)
        clk_prepare_enable(s5p_ehci->clk);
 
        if (pdata && pdata->phy_init)
-               pdata->phy_init(pdev, S5P_USB_PHY_HOST);
+               pdata->phy_init(pdev, USB_PHY_TYPE_HOST);
 
        /* DMA burst Enable */
        writel(EHCI_INSNREG00_ENABLE_DMA_BURST, EHCI_INSNREG00(hcd->regs));

diff --git a/drivers/usb/host/ohci-exynos.c b/drivers/usb/host/ohci-exynos.c
index aa3b8844bb9fd7dfaf7e8a08322a80a500420d8f..804fb62a888c478cbbe6913e8dc486ece21e181d 100644 (file)
--- a/drivers/usb/host/ohci-exynos.c
+++ b/drivers/usb/host/ohci-exynos.c
@@ -15,6 +15,7 @@
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/platform_data/usb-exynos.h>
+#include <linux/usb/samsung_usb_phy.h>
 #include <plat/usb-phy.h>
 
 struct exynos_ohci_hcd {
@@ -153,7 +154,7 @@ static int exynos_ohci_probe(struct platform_device *pdev)
        }
 
        if (pdata->phy_init)
-               pdata->phy_init(pdev, S5P_USB_PHY_HOST);
+               pdata->phy_init(pdev, USB_PHY_TYPE_HOST);
 
        ohci = hcd_to_ohci(hcd);
        ohci_hcd_init(ohci);
@@ -184,7 +185,7 @@ static int exynos_ohci_remove(struct platform_device *pdev)
        usb_remove_hcd(hcd);
 
        if (pdata && pdata->phy_exit)
-               pdata->phy_exit(pdev, S5P_USB_PHY_HOST);
+               pdata->phy_exit(pdev, USB_PHY_TYPE_HOST);
 
        clk_disable_unprepare(exynos_ohci->clk);
 
@@ -229,7 +230,7 @@ static int exynos_ohci_suspend(struct device *dev)
        clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
 
        if (pdata && pdata->phy_exit)
-               pdata->phy_exit(pdev, S5P_USB_PHY_HOST);
+               pdata->phy_exit(pdev, USB_PHY_TYPE_HOST);
 
        clk_disable_unprepare(exynos_ohci->clk);
 
@@ -249,7 +250,7 @@ static int exynos_ohci_resume(struct device *dev)
        clk_prepare_enable(exynos_ohci->clk);
 
        if (pdata && pdata->phy_init)
-               pdata->phy_init(pdev, S5P_USB_PHY_HOST);
+               pdata->phy_init(pdev, USB_PHY_TYPE_HOST);
 
        ohci_resume(hcd, false);
 

diff --git a/include/linux/usb/samsung_usb_phy.h b/include/linux/usb/samsung_usb_phy.h
new file mode 100644 (file)
index 0000000..9167826
--- /dev/null
+++ b/include/linux/usb/samsung_usb_phy.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) 2012 Samsung Electronics Co.Ltd
+ *             http://www.samsung.com/
+ *
+ * Defines phy types for samsung usb phy controllers - HOST or DEIVCE.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+enum samsung_usb_phy_type {
+       USB_PHY_TYPE_DEVICE,
+       USB_PHY_TYPE_HOST,
+};