diff options
author | Sachin Kamat <sachin.kamat@linaro.org> | 2012-05-12 03:36:19 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-12 03:36:19 -0400 |
commit | 691bcb31ac203263b5361a8bbcfbf32b914c36c0 (patch) | |
tree | a4b907cdcd454346e3f1596cf344aa36ec27afb3 /arch/arm | |
parent | ab25a8d391ad057bdb5a7153afbac7dc3514aaf3 (diff) |
ARM: EXYNOS: Add MFC device to SMDK4X12
MFC (multi-format codec) device is added to SMDK4212 and SMDK4412 boards.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-exynos/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-exynos/mach-smdk4x12.c | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 134b18f4c26e..1db63cb33bef 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig | |||
@@ -346,6 +346,7 @@ config MACH_SMDK4212 | |||
346 | select S3C_DEV_I2C7 | 346 | select S3C_DEV_I2C7 |
347 | select S3C_DEV_RTC | 347 | select S3C_DEV_RTC |
348 | select S3C_DEV_WDT | 348 | select S3C_DEV_WDT |
349 | select S5P_DEV_MFC | ||
349 | select SAMSUNG_DEV_BACKLIGHT | 350 | select SAMSUNG_DEV_BACKLIGHT |
350 | select SAMSUNG_DEV_KEYPAD | 351 | select SAMSUNG_DEV_KEYPAD |
351 | select SAMSUNG_DEV_PWM | 352 | select SAMSUNG_DEV_PWM |
diff --git a/arch/arm/mach-exynos/mach-smdk4x12.c b/arch/arm/mach-exynos/mach-smdk4x12.c index d00e4f016a68..75df391e5101 100644 --- a/arch/arm/mach-exynos/mach-smdk4x12.c +++ b/arch/arm/mach-exynos/mach-smdk4x12.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <plat/gpio-cfg.h> | 31 | #include <plat/gpio-cfg.h> |
32 | #include <plat/iic.h> | 32 | #include <plat/iic.h> |
33 | #include <plat/keypad.h> | 33 | #include <plat/keypad.h> |
34 | #include <plat/mfc.h> | ||
34 | #include <plat/regs-serial.h> | 35 | #include <plat/regs-serial.h> |
35 | #include <plat/sdhci.h> | 36 | #include <plat/sdhci.h> |
36 | 37 | ||
@@ -244,6 +245,9 @@ static struct platform_device *smdk4x12_devices[] __initdata = { | |||
244 | &s3c_device_i2c7, | 245 | &s3c_device_i2c7, |
245 | &s3c_device_rtc, | 246 | &s3c_device_rtc, |
246 | &s3c_device_wdt, | 247 | &s3c_device_wdt, |
248 | &s5p_device_mfc, | ||
249 | &s5p_device_mfc_l, | ||
250 | &s5p_device_mfc_r, | ||
247 | &samsung_device_keypad, | 251 | &samsung_device_keypad, |
248 | }; | 252 | }; |
249 | 253 | ||
@@ -256,6 +260,11 @@ static void __init smdk4x12_map_io(void) | |||
256 | s3c24xx_init_uarts(smdk4x12_uartcfgs, ARRAY_SIZE(smdk4x12_uartcfgs)); | 260 | s3c24xx_init_uarts(smdk4x12_uartcfgs, ARRAY_SIZE(smdk4x12_uartcfgs)); |
257 | } | 261 | } |
258 | 262 | ||
263 | static void __init smdk4x12_reserve(void) | ||
264 | { | ||
265 | s5p_mfc_reserve_mem(0x43000000, 8 << 20, 0x51000000, 8 << 20); | ||
266 | } | ||
267 | |||
259 | static void __init smdk4x12_machine_init(void) | 268 | static void __init smdk4x12_machine_init(void) |
260 | { | 269 | { |
261 | s3c_i2c0_set_platdata(NULL); | 270 | s3c_i2c0_set_platdata(NULL); |
@@ -293,6 +302,7 @@ MACHINE_START(SMDK4212, "SMDK4212") | |||
293 | .init_machine = smdk4x12_machine_init, | 302 | .init_machine = smdk4x12_machine_init, |
294 | .timer = &exynos4_timer, | 303 | .timer = &exynos4_timer, |
295 | .restart = exynos4_restart, | 304 | .restart = exynos4_restart, |
305 | .reserve = &smdk4x12_reserve, | ||
296 | MACHINE_END | 306 | MACHINE_END |
297 | 307 | ||
298 | MACHINE_START(SMDK4412, "SMDK4412") | 308 | MACHINE_START(SMDK4412, "SMDK4412") |
@@ -305,4 +315,5 @@ MACHINE_START(SMDK4412, "SMDK4412") | |||
305 | .init_machine = smdk4x12_machine_init, | 315 | .init_machine = smdk4x12_machine_init, |
306 | .timer = &exynos4_timer, | 316 | .timer = &exynos4_timer, |
307 | .restart = exynos4_restart, | 317 | .restart = exynos4_restart, |
318 | .reserve = &smdk4x12_reserve, | ||
308 | MACHINE_END | 319 | MACHINE_END |