diff options
-rw-r--r-- | arch/arm/mach-exynos/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-exynos/mach-smdk4x12.c | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 498596b3adbb..4bb2fbb90dae 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig | |||
@@ -362,6 +362,7 @@ config MACH_SMDK4212 | |||
362 | select S3C_DEV_I2C3 | 362 | select S3C_DEV_I2C3 |
363 | select S3C_DEV_I2C7 | 363 | select S3C_DEV_I2C7 |
364 | select S3C_DEV_RTC | 364 | select S3C_DEV_RTC |
365 | select S3C_DEV_USB_HSOTG | ||
365 | select S3C_DEV_WDT | 366 | select S3C_DEV_WDT |
366 | select S5P_DEV_FIMC0 | 367 | select S5P_DEV_FIMC0 |
367 | select S5P_DEV_FIMC1 | 368 | select S5P_DEV_FIMC1 |
@@ -378,6 +379,7 @@ config MACH_SMDK4212 | |||
378 | select EXYNOS4_SETUP_I2C7 | 379 | select EXYNOS4_SETUP_I2C7 |
379 | select EXYNOS4_SETUP_KEYPAD | 380 | select EXYNOS4_SETUP_KEYPAD |
380 | select EXYNOS4_SETUP_SDHCI | 381 | select EXYNOS4_SETUP_SDHCI |
382 | select EXYNOS4_SETUP_USB_PHY | ||
381 | help | 383 | help |
382 | Machine support for Samsung SMDK4212 | 384 | Machine support for Samsung SMDK4212 |
383 | 385 | ||
diff --git a/arch/arm/mach-exynos/mach-smdk4x12.c b/arch/arm/mach-exynos/mach-smdk4x12.c index e134c9562f15..61abbc465c54 100644 --- a/arch/arm/mach-exynos/mach-smdk4x12.c +++ b/arch/arm/mach-exynos/mach-smdk4x12.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/pwm_backlight.h> | 19 | #include <linux/pwm_backlight.h> |
20 | #include <linux/regulator/machine.h> | 20 | #include <linux/regulator/machine.h> |
21 | #include <linux/serial_core.h> | 21 | #include <linux/serial_core.h> |
22 | #include <linux/platform_data/s3c-hsotg.h> | ||
22 | 23 | ||
23 | #include <asm/mach/arch.h> | 24 | #include <asm/mach/arch.h> |
24 | #include <asm/hardware/gic.h> | 25 | #include <asm/hardware/gic.h> |
@@ -236,6 +237,9 @@ static struct samsung_keypad_platdata smdk4x12_keypad_data __initdata = { | |||
236 | .cols = 8, | 237 | .cols = 8, |
237 | }; | 238 | }; |
238 | 239 | ||
240 | /* USB OTG */ | ||
241 | static struct s3c_hsotg_plat smdk4x12_hsotg_pdata; | ||
242 | |||
239 | static struct platform_device *smdk4x12_devices[] __initdata = { | 243 | static struct platform_device *smdk4x12_devices[] __initdata = { |
240 | &s3c_device_hsmmc2, | 244 | &s3c_device_hsmmc2, |
241 | &s3c_device_hsmmc3, | 245 | &s3c_device_hsmmc3, |
@@ -244,6 +248,7 @@ static struct platform_device *smdk4x12_devices[] __initdata = { | |||
244 | &s3c_device_i2c3, | 248 | &s3c_device_i2c3, |
245 | &s3c_device_i2c7, | 249 | &s3c_device_i2c7, |
246 | &s3c_device_rtc, | 250 | &s3c_device_rtc, |
251 | &s3c_device_usb_hsotg, | ||
247 | &s3c_device_wdt, | 252 | &s3c_device_wdt, |
248 | &s5p_device_fimc0, | 253 | &s5p_device_fimc0, |
249 | &s5p_device_fimc1, | 254 | &s5p_device_fimc1, |
@@ -295,6 +300,8 @@ static void __init smdk4x12_machine_init(void) | |||
295 | s3c_sdhci2_set_platdata(&smdk4x12_hsmmc2_pdata); | 300 | s3c_sdhci2_set_platdata(&smdk4x12_hsmmc2_pdata); |
296 | s3c_sdhci3_set_platdata(&smdk4x12_hsmmc3_pdata); | 301 | s3c_sdhci3_set_platdata(&smdk4x12_hsmmc3_pdata); |
297 | 302 | ||
303 | s3c_hsotg_set_platdata(&smdk4x12_hsotg_pdata); | ||
304 | |||
298 | platform_add_devices(smdk4x12_devices, ARRAY_SIZE(smdk4x12_devices)); | 305 | platform_add_devices(smdk4x12_devices, ARRAY_SIZE(smdk4x12_devices)); |
299 | } | 306 | } |
300 | 307 | ||