aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorKamil Debski <k.debski@samsung.com>2011-07-21 03:43:20 -0400
committerKukjin Kim <kgene.kim@samsung.com>2011-07-21 04:29:14 -0400
commitb14f04dbdcd52aa78de7bd88e53d9387b843edde (patch)
tree0a4ca8d22d7efb885c525c9d0db0db08dad48441 /arch/arm
parent66eb1238deb06f3bc1185c31cf0ee68d75fb7385 (diff)
ARM: EXYNOS4: Enable MFC on universal_c210
Signed-off-by: Kamil Debski <k.debski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-exynos4/Kconfig2
-rw-r--r--arch/arm/mach-exynos4/mach-universal_c210.c13
2 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig
index 75982b53e527..521bd3a1559d 100644
--- a/arch/arm/mach-exynos4/Kconfig
+++ b/arch/arm/mach-exynos4/Kconfig
@@ -180,7 +180,9 @@ config MACH_UNIVERSAL_C210
180 select S3C_DEV_I2C1 180 select S3C_DEV_I2C1
181 select S3C_DEV_I2C3 181 select S3C_DEV_I2C3
182 select S3C_DEV_I2C5 182 select S3C_DEV_I2C5
183 select S5P_DEV_MFC
183 select S5P_DEV_ONENAND 184 select S5P_DEV_ONENAND
185 select EXYNOS4_DEV_PD
184 select EXYNOS4_SETUP_I2C1 186 select EXYNOS4_SETUP_I2C1
185 select EXYNOS4_SETUP_I2C3 187 select EXYNOS4_SETUP_I2C3
186 select EXYNOS4_SETUP_I2C5 188 select EXYNOS4_SETUP_I2C5
diff --git a/arch/arm/mach-exynos4/mach-universal_c210.c b/arch/arm/mach-exynos4/mach-universal_c210.c
index 5d8b097bb697..0e280d12301e 100644
--- a/arch/arm/mach-exynos4/mach-universal_c210.c
+++ b/arch/arm/mach-exynos4/mach-universal_c210.c
@@ -31,7 +31,9 @@
31#include <plat/devs.h> 31#include <plat/devs.h>
32#include <plat/iic.h> 32#include <plat/iic.h>
33#include <plat/gpio-cfg.h> 33#include <plat/gpio-cfg.h>
34#include <plat/mfc.h>
34#include <plat/sdhci.h> 35#include <plat/sdhci.h>
36#include <plat/pd.h>
35 37
36#include <mach/map.h> 38#include <mach/map.h>
37 39
@@ -717,6 +719,10 @@ static struct platform_device *universal_devices[] __initdata = {
717 &i2c_gpio12, 719 &i2c_gpio12,
718 &universal_gpio_keys, 720 &universal_gpio_keys,
719 &s5p_device_onenand, 721 &s5p_device_onenand,
722 &s5p_device_mfc,
723 &s5p_device_mfc_l,
724 &s5p_device_mfc_r,
725 &exynos4_device_pd[PD_MFC],
720}; 726};
721 727
722static void __init universal_map_io(void) 728static void __init universal_map_io(void)
@@ -726,6 +732,11 @@ static void __init universal_map_io(void)
726 s3c24xx_init_uarts(universal_uartcfgs, ARRAY_SIZE(universal_uartcfgs)); 732 s3c24xx_init_uarts(universal_uartcfgs, ARRAY_SIZE(universal_uartcfgs));
727} 733}
728 734
735static void __init universal_reserve(void)
736{
737 s5p_mfc_reserve_mem(0x43000000, 8 << 20, 0x51000000, 8 << 20);
738}
739
729static void __init universal_machine_init(void) 740static void __init universal_machine_init(void)
730{ 741{
731 universal_sdhci_init(); 742 universal_sdhci_init();
@@ -746,6 +757,7 @@ static void __init universal_machine_init(void)
746 757
747 /* Last */ 758 /* Last */
748 platform_add_devices(universal_devices, ARRAY_SIZE(universal_devices)); 759 platform_add_devices(universal_devices, ARRAY_SIZE(universal_devices));
760 s5p_device_mfc.dev.parent = &exynos4_device_pd[PD_MFC].dev;
749} 761}
750 762
751MACHINE_START(UNIVERSAL_C210, "UNIVERSAL_C210") 763MACHINE_START(UNIVERSAL_C210, "UNIVERSAL_C210")
@@ -755,4 +767,5 @@ MACHINE_START(UNIVERSAL_C210, "UNIVERSAL_C210")
755 .map_io = universal_map_io, 767 .map_io = universal_map_io,
756 .init_machine = universal_machine_init, 768 .init_machine = universal_machine_init,
757 .timer = &exynos4_timer, 769 .timer = &exynos4_timer,
770 .reserve = &universal_reserve,
758MACHINE_END 771MACHINE_END