usb:hsotg:samsung: Remove platform dependency from s3c-hsotg

This code removes platform dependency from s3c-hsotg driver.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

10 files changed, 23 insertions, 19 deletions

diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c
index b4f1f902ce6d..e284b0e4ca2e 100644
--- a/arch/arm/mach-exynos/mach-nuri.c
+++ b/arch/arm/mach-exynos/mach-nuri.c
@@ -44,6 +44,7 @@
 #include <plat/fb.h>
 #include <plat/sdhci.h>
 #include <plat/ehci.h>
+#include <linux/platform_data/s3c-hsotg.h>
 #include <plat/clock.h>
 #include <plat/gpio-cfg.h>
 #include <plat/iic.h>
diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c
index 7ebf79c2ab34..ad15d0fda3c1 100644
--- a/arch/arm/mach-exynos/mach-universal_c210.c
+++ b/arch/arm/mach-exynos/mach-universal_c210.c
@@ -42,6 +42,7 @@
 #include <plat/fimc-core.h>
 #include <plat/camport.h>
 #include <plat/mipi_csis.h>
+#include <linux/platform_data/s3c-hsotg.h>
 
 #include <mach/map.h>
 
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c
index e20bf5835365..a02f204d99ed 100644
--- a/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
@@ -61,7 +61,7 @@
 #include <plat/sdhci.h>
 #include <plat/gpio-cfg.h>
 #include <plat/s3c64xx-spi.h>
-#include <plat/udc-hs.h>
+#include <linux/platform_data/s3c-hsotg.h>
 
 #include <plat/keypad.h>
 #include <plat/clock.h>
diff --git a/arch/arm/mach-s3c64xx/mach-smartq.c b/arch/arm/mach-s3c64xx/mach-smartq.c
index ce745e19aa27..ee0d13c98378 100644
--- a/arch/arm/mach-s3c64xx/mach-smartq.c
+++ b/arch/arm/mach-s3c64xx/mach-smartq.c
@@ -33,7 +33,7 @@
 #include <plat/gpio-cfg.h>
 #include <plat/hwmon.h>
 #include <plat/regs-serial.h>
-#include <plat/udc-hs.h>
+#include <linux/platform_data/s3c-hsotg.h>
 #include <plat/usb-control.h>
 #include <plat/sdhci.h>
 #include <plat/ts.h>
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c
index d55bc96d9582..bf477e33f0ee 100644
--- a/arch/arm/mach-s3c64xx/mach-smdk6410.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c
@@ -72,7 +72,7 @@
 #include <plat/keypad.h>
 #include <plat/backlight.h>
 #include <plat/regs-fb-v4.h>
-#include <plat/udc-hs.h>
+#include <linux/platform_data/s3c-hsotg.h>
 
 #include "common.h"
 
diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c
index a8933de3d627..921da285ff20 100644
--- a/arch/arm/mach-s5pv210/mach-goni.c
+++ b/arch/arm/mach-s5pv210/mach-goni.c
@@ -49,6 +49,7 @@
 #include <plat/mfc.h>
 #include <plat/regs-fb-v4.h>
 #include <plat/camport.h>
+#include <linux/platform_data/s3c-hsotg.h>
 
 #include <media/v4l2-mediabus.h>
 #include <media/s5p_fimc.h>
diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c
index 8b928f9bc1c3..a41c808847c0 100644
--- a/arch/arm/plat-samsung/devs.c
+++ b/arch/arm/plat-samsung/devs.c
@@ -57,7 +57,7 @@
 #include <plat/sdhci.h>
 #include <plat/ts.h>
 #include <plat/udc.h>
-#include <plat/udc-hs.h>
+#include <linux/platform_data/s3c-hsotg.h>
 #include <plat/usb-control.h>
 #include <plat/usb-phy.h>
 #include <plat/regs-iic.h>
diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c
index 105b206cd844..70c6f3b45cf2 100644
--- a/drivers/usb/gadget/s3c-hsotg.c
+++ b/drivers/usb/gadget/s3c-hsotg.c
@@ -34,9 +34,9 @@
 #include <mach/map.h>
 
 #include <plat/regs-usb-hsotg-phy.h>
-#include <plat/regs-usb-hsotg.h>
+#include "s3c-hsotg.h"
+#include <linux/platform_data/s3c-hsotg.h>
 #include <mach/regs-sys.h>
-#include <plat/udc-hs.h>
 #include <plat/cpu.h>
 
 #define DMA_ADDR_INVALID (~((dma_addr_t)0))
diff --git a/arch/arm/plat-samsung/include/plat/regs-usb-hsotg.h b/drivers/usb/gadget/s3c-hsotg.h
index dc90f5ede88f..4c4ccc44b577 100644
--- a/arch/arm/plat-samsung/include/plat/regs-usb-hsotg.h
+++ b/drivers/usb/gadget/s3c-hsotg.h
@@ -156,7 +156,7 @@
 
 #define S3C_HPTXFSIZ                            S3C_HSOTG_REG(0x100)
 
-#define S3C_DPTXFSIZn(_a)                       S3C_HSOTG_REG(0x104 + (((_a) - 1) * 4))
+#define S3C_DPTXFSIZn(_a)               S3C_HSOTG_REG(0x104 + (((_a) - 1) * 4))
 
 #define S3C_DPTXFSIZn_DPTxFSize_MASK            (0xffff << 16)
 #define S3C_DPTXFSIZn_DPTxFSize_SHIFT           (16)
@@ -261,8 +261,8 @@
 
 #define S3C_DIEPCTL0                            S3C_HSOTG_REG(0x900)
 #define S3C_DOEPCTL0                            S3C_HSOTG_REG(0xB00)
-#define S3C_DIEPCTL(_a)                         S3C_HSOTG_REG(0x900 + ((_a) * 0x20))
-#define S3C_DOEPCTL(_a)                         S3C_HSOTG_REG(0xB00 + ((_a) * 0x20))
+#define S3C_DIEPCTL(_a)                 S3C_HSOTG_REG(0x900 + ((_a) * 0x20))
+#define S3C_DOEPCTL(_a)                 S3C_HSOTG_REG(0xB00 + ((_a) * 0x20))
 
 /* EP0 specialness:
  * bits[29..28] - reserved (no SetD0PID, SetD1PID)
@@ -312,8 +312,8 @@
 #define S3C_DxEPCTL_MPS_LIMIT                   (0x7ff)
 #define S3C_DxEPCTL_MPS(_x)                     ((_x) << 0)
 
-#define S3C_DIEPINT(_a)                         S3C_HSOTG_REG(0x908 + ((_a) * 0x20))
-#define S3C_DOEPINT(_a)                         S3C_HSOTG_REG(0xB08 + ((_a) * 0x20))
+#define S3C_DIEPINT(_a)                 S3C_HSOTG_REG(0x908 + ((_a) * 0x20))
+#define S3C_DOEPINT(_a)                 S3C_HSOTG_REG(0xB08 + ((_a) * 0x20))
 
 #define S3C_DxEPINT_INEPNakEff                  (1 << 6)
 #define S3C_DxEPINT_Back2BackSetup              (1 << 6)
@@ -349,8 +349,8 @@
 #define S3C_DOEPTSIZ0_XferSize_MASK             (0x7f << 0)
 #define S3C_DOEPTSIZ0_XferSize_SHIFT            (0)
 
-#define S3C_DIEPTSIZ(_a)                        S3C_HSOTG_REG(0x910 + ((_a) * 0x20))
-#define S3C_DOEPTSIZ(_a)                        S3C_HSOTG_REG(0xB10 + ((_a) * 0x20))
+#define S3C_DIEPTSIZ(_a)                S3C_HSOTG_REG(0x910 + ((_a) * 0x20))
+#define S3C_DOEPTSIZ(_a)                S3C_HSOTG_REG(0xB10 + ((_a) * 0x20))
 
 #define S3C_DxEPTSIZ_MC_MASK                    (0x3 << 29)
 #define S3C_DxEPTSIZ_MC_SHIFT                   (29)
@@ -370,10 +370,10 @@
 #define S3C_DxEPTSIZ_XferSize(_x)               ((_x) << 0)
 
 
-#define S3C_DIEPDMA(_a)                         S3C_HSOTG_REG(0x914 + ((_a) * 0x20))
-#define S3C_DOEPDMA(_a)                         S3C_HSOTG_REG(0xB14 + ((_a) * 0x20))
-#define S3C_DTXFSTS(_a)                         S3C_HSOTG_REG(0x918 + ((_a) * 0x20))
+#define S3C_DIEPDMA(_a)                 S3C_HSOTG_REG(0x914 + ((_a) * 0x20))
+#define S3C_DOEPDMA(_a)                 S3C_HSOTG_REG(0xB14 + ((_a) * 0x20))
+#define S3C_DTXFSTS(_a)                 S3C_HSOTG_REG(0x918 + ((_a) * 0x20))
 
-#define S3C_EPFIFO(_a)                          S3C_HSOTG_REG(0x1000 + ((_a) * 0x1000))
+#define S3C_EPFIFO(_a)                  S3C_HSOTG_REG(0x1000 + ((_a) * 0x1000))
 
 #endif /* __PLAT_S3C64XX_REGS_USB_HSOTG_H */
diff --git a/arch/arm/plat-samsung/include/plat/udc-hs.h b/include/linux/platform_data/s3c-hsotg.h
index c9e3667cb2b1..97ec12c2ded4 100644
--- a/arch/arm/plat-samsung/include/plat/udc-hs.h
+++ b/include/linux/platform_data/s3c-hsotg.h
@@ -1,4 +1,4 @@
-/* arch/arm/plat-s3c/include/plat/udc-hs.h
+/* include/linux/platform_data/s3c-hsotg.h
  *
  * Copyright 2008 Openmoko, Inc.
  * Copyright 2008 Simtec Electronics
@@ -25,7 +25,8 @@ enum s3c_hsotg_dmamode {
  */
 struct s3c_hsotg_plat {
         enum s3c_hsotg_dmamode  dma;
-        unsigned int            is_osc : 1;
+        unsigned int            is_osc:1;
+        int                     phy_type;
 
         int (*phy_init)(struct platform_device *pdev, int type);
         int (*phy_exit)(struct platform_device *pdev, int type);