1 files changed, 21 insertions, 0 deletions

diff --git a/arch/arm/mach-exynos4/mach-origen.c b/arch/arm/mach-exynos4/mach-origen.c
index 71db8480bb5a..f80b563f2be7 100644
--- a/arch/arm/mach-exynos4/mach-origen.c
+++ b/arch/arm/mach-exynos4/mach-origen.c
@@ -39,6 +39,7 @@
 #include <plat/backlight.h>
 #include <plat/pd.h>
 #include <plat/fb.h>
+#include <plat/mfc.h>
 
 #include <mach/map.h>
 
@@ -89,6 +90,8 @@ static struct s3c2410_uartcfg origen_uartcfgs[] __initdata = {
 
 static struct regulator_consumer_supply __initdata ldo3_consumer[] = {
         REGULATOR_SUPPLY("vdd11", "s5p-mipi-csis.0"), /* MIPI */
+        REGULATOR_SUPPLY("vdd", "exynos4-hdmi"), /* HDMI */
+        REGULATOR_SUPPLY("vdd_pll", "exynos4-hdmi"), /* HDMI */
 };
 static struct regulator_consumer_supply __initdata ldo6_consumer[] = {
         REGULATOR_SUPPLY("vdd18", "s5p-mipi-csis.0"), /* MIPI */
@@ -98,6 +101,7 @@ static struct regulator_consumer_supply __initdata ldo7_consumer[] = {
 };
 static struct regulator_consumer_supply __initdata ldo8_consumer[] = {
         REGULATOR_SUPPLY("vdd", "s5p-adc"), /* ADC */
+        REGULATOR_SUPPLY("vdd_osc", "exynos4-hdmi"), /* HDMI */
 };
 static struct regulator_consumer_supply __initdata ldo9_consumer[] = {
         REGULATOR_SUPPLY("dvdd", "swb-a31"), /* AR6003 WLAN & CSR 8810 BT */
@@ -598,9 +602,17 @@ static struct platform_device *origen_devices[] __initdata = {
         &s5p_device_fimd0,
         &s5p_device_hdmi,
         &s5p_device_i2c_hdmiphy,
+        &s5p_device_mfc,
+        &s5p_device_mfc_l,
+        &s5p_device_mfc_r,
         &s5p_device_mixer,
         &exynos4_device_pd[PD_LCD0],
         &exynos4_device_pd[PD_TV],
+        &exynos4_device_pd[PD_G3D],
+        &exynos4_device_pd[PD_LCD1],
+        &exynos4_device_pd[PD_CAM],
+        &exynos4_device_pd[PD_GPS],
+        &exynos4_device_pd[PD_MFC],
         &origen_device_gpiokeys,
         &origen_lcd_hv070wsa,
 };
@@ -638,6 +650,11 @@ static void __init origen_power_init(void)
         s3c_gpio_setpull(EXYNOS4_GPX0(4), S3C_GPIO_PULL_NONE);
 }
 
+static void __init origen_reserve(void)
+{
+        s5p_mfc_reserve_mem(0x43000000, 8 << 20, 0x51000000, 8 << 20);
+}
+
 static void __init origen_machine_init(void)
 {
         origen_power_init();
@@ -661,11 +678,14 @@ static void __init origen_machine_init(void)
         s5p_fimd0_set_platdata(&origen_lcd_pdata);
 
         platform_add_devices(origen_devices, ARRAY_SIZE(origen_devices));
+
         s5p_device_fimd0.dev.parent = &exynos4_device_pd[PD_LCD0].dev;
 
         s5p_device_hdmi.dev.parent = &exynos4_device_pd[PD_TV].dev;
         s5p_device_mixer.dev.parent = &exynos4_device_pd[PD_TV].dev;
 
+        s5p_device_mfc.dev.parent = &exynos4_device_pd[PD_MFC].dev;
+
         samsung_bl_set(&origen_bl_gpio_info, &origen_bl_data);
 }
 
@@ -676,4 +696,5 @@ MACHINE_START(ORIGEN, "ORIGEN")
         .map_io         = origen_map_io,
         .init_machine   = origen_machine_init,
         .timer          = &exynos4_timer,
+        .reserve        = &origen_reserve,
 MACHINE_END