From 6c4c8be576a740257231bcdf166cd52ed97617ce Mon Sep 17 00:00:00 2001
From: Jingoo Han <jg1.han@samsung.com>
Date: Wed, 28 Sep 2011 10:33:25 +0900
Subject: [PATCH] --- yaml --- r: 274055 b: refs/heads/master c:
 9830f6a20d841acc36bd9ee275aa4586dd713749 h: refs/heads/master i:   274053:
 66641afda0219edccb0f4908d16a0e52f9acfdfc   274051:
 133c63528d6f4bc80b889cefe8d60244970d35de   274047:
 475c0142b94897ec0a4b46bf4f63cd1ae579fccd v: v3

---
 [refs]                                      |  2 +-
 trunk/arch/arm/mach-exynos4/Kconfig         |  2 ++
 trunk/arch/arm/mach-exynos4/mach-smdkv310.c | 16 ++++++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ba8e3dd5a737..77b2cd2d540c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b069b7709c6b5d1492342164976ebfa178de31f
+refs/heads/master: 9830f6a20d841acc36bd9ee275aa4586dd713749
diff --git a/trunk/arch/arm/mach-exynos4/Kconfig b/trunk/arch/arm/mach-exynos4/Kconfig
index 980ffd6ccc4e..c4068fd7b83c 100644
--- a/trunk/arch/arm/mach-exynos4/Kconfig
+++ b/trunk/arch/arm/mach-exynos4/Kconfig
@@ -142,6 +142,7 @@ config MACH_SMDKV310
 	select S5P_DEV_I2C_HDMIPHY
 	select S5P_DEV_MFC
 	select S5P_DEV_TV
+	select S5P_DEV_USB_EHCI
 	select S3C_DEV_HSMMC
 	select S3C_DEV_HSMMC1
 	select S3C_DEV_HSMMC2
@@ -156,6 +157,7 @@ config MACH_SMDKV310
 	select EXYNOS4_SETUP_I2C1
 	select EXYNOS4_SETUP_KEYPAD
 	select EXYNOS4_SETUP_SDHCI
+	select EXYNOS4_SETUP_USB_PHY
 	help
 	  Machine support for Samsung SMDKV310
 
diff --git a/trunk/arch/arm/mach-exynos4/mach-smdkv310.c b/trunk/arch/arm/mach-exynos4/mach-smdkv310.c
index 5ba432e21e27..0fa734c1aa69 100644
--- a/trunk/arch/arm/mach-exynos4/mach-smdkv310.c
+++ b/trunk/arch/arm/mach-exynos4/mach-smdkv310.c
@@ -33,6 +33,8 @@
 #include <plat/gpio-cfg.h>
 #include <plat/backlight.h>
 #include <plat/mfc.h>
+#include <plat/ehci.h>
+#include <plat/clock.h>
 
 #include <mach/map.h>
 
@@ -167,6 +169,16 @@ static struct i2c_board_info i2c_devs1[] __initdata = {
 	{I2C_BOARD_INFO("wm8994", 0x1a),},
 };
 
+/* USB EHCI */
+static struct s5p_ehci_platdata smdkv310_ehci_pdata;
+
+static void __init smdkv310_ehci_init(void)
+{
+	struct s5p_ehci_platdata *pdata = &smdkv310_ehci_pdata;
+
+	s5p_ehci_set_platdata(pdata);
+}
+
 static struct platform_device *smdkv310_devices[] __initdata = {
 	&s3c_device_hsmmc0,
 	&s3c_device_hsmmc1,
@@ -176,6 +188,7 @@ static struct platform_device *smdkv310_devices[] __initdata = {
 	&s5p_device_i2c_hdmiphy,
 	&s3c_device_rtc,
 	&s3c_device_wdt,
+	&s5p_device_ehci,
 	&exynos4_device_ac97,
 	&exynos4_device_i2s0,
 	&samsung_device_keypad,
@@ -276,6 +289,9 @@ static void __init smdkv310_machine_init(void)
 
 	samsung_bl_set(&smdkv310_bl_gpio_info, &smdkv310_bl_data);
 
+	smdkv310_ehci_init();
+	clk_xusbxti.rate = 24000000;
+
 	platform_add_devices(smdkv310_devices, ARRAY_SIZE(smdkv310_devices));
 	s5p_device_mfc.dev.parent = &exynos4_device_pd[PD_MFC].dev;
 }