]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ARM: EXYNOS: Add MFC device to SMDK4X12
authorSachin Kamat <sachin.kamat@linaro.org>
Sat, 12 May 2012 07:36:19 +0000 (16:36 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Sat, 12 May 2012 07:36:19 +0000 (16:36 +0900)
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>
arch/arm/mach-exynos/Kconfig
arch/arm/mach-exynos/mach-smdk4x12.c

index 134b18f4c26efe10333c632d4863bd5687ed244c..1db63cb33befe8f78b7f85c14713e7787e5b5f91 100644 (file)
@@ -346,6 +346,7 @@ config MACH_SMDK4212
        select S3C_DEV_I2C7
        select S3C_DEV_RTC
        select S3C_DEV_WDT
+       select S5P_DEV_MFC
        select SAMSUNG_DEV_BACKLIGHT
        select SAMSUNG_DEV_KEYPAD
        select SAMSUNG_DEV_PWM
index d00e4f016a684c5c37715c46618e303661e115bd..75df391e5101fe49bd9f0a41205ac73b18e5fe35 100644 (file)
@@ -31,6 +31,7 @@
 #include <plat/gpio-cfg.h>
 #include <plat/iic.h>
 #include <plat/keypad.h>
+#include <plat/mfc.h>
 #include <plat/regs-serial.h>
 #include <plat/sdhci.h>
 
@@ -244,6 +245,9 @@ static struct platform_device *smdk4x12_devices[] __initdata = {
        &s3c_device_i2c7,
        &s3c_device_rtc,
        &s3c_device_wdt,
+       &s5p_device_mfc,
+       &s5p_device_mfc_l,
+       &s5p_device_mfc_r,
        &samsung_device_keypad,
 };
 
@@ -256,6 +260,11 @@ static void __init smdk4x12_map_io(void)
        s3c24xx_init_uarts(smdk4x12_uartcfgs, ARRAY_SIZE(smdk4x12_uartcfgs));
 }
 
+static void __init smdk4x12_reserve(void)
+{
+       s5p_mfc_reserve_mem(0x43000000, 8 << 20, 0x51000000, 8 << 20);
+}
+
 static void __init smdk4x12_machine_init(void)
 {
        s3c_i2c0_set_platdata(NULL);
@@ -293,6 +302,7 @@ MACHINE_START(SMDK4212, "SMDK4212")
        .init_machine   = smdk4x12_machine_init,
        .timer          = &exynos4_timer,
        .restart        = exynos4_restart,
+       .reserve        = &smdk4x12_reserve,
 MACHINE_END
 
 MACHINE_START(SMDK4412, "SMDK4412")
@@ -305,4 +315,5 @@ MACHINE_START(SMDK4412, "SMDK4412")
        .init_machine   = smdk4x12_machine_init,
        .timer          = &exynos4_timer,
        .restart        = exynos4_restart,
+       .reserve        = &smdk4x12_reserve,
 MACHINE_END