aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMarek Szyprowski <m.szyprowski@samsung.com>2011-07-21 03:43:25 -0400
committerKukjin Kim <kgene.kim@samsung.com>2011-07-21 04:29:20 -0400
commit4c0f0a3ea1210082909f053eca75ba1149f3b039 (patch)
tree3b7db5a4f9559613f5dd25eeb6ab4726ff633375 /arch
parentb14f04dbdcd52aa78de7bd88e53d9387b843edde (diff)
ARM: EXYNOS4: Enable MFC on Samsung NURI
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-exynos4/Kconfig2
-rw-r--r--arch/arm/mach-exynos4/mach-nuri.c13
2 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig
index 521bd3a1559d..dd8ae586ac56 100644
--- a/arch/arm/mach-exynos4/Kconfig
+++ b/arch/arm/mach-exynos4/Kconfig
@@ -201,7 +201,9 @@ config MACH_NURI
201 select S3C_DEV_I2C1 201 select S3C_DEV_I2C1
202 select S3C_DEV_I2C3 202 select S3C_DEV_I2C3
203 select S3C_DEV_I2C5 203 select S3C_DEV_I2C5
204 select S5P_DEV_MFC
204 select S5P_DEV_USB_EHCI 205 select S5P_DEV_USB_EHCI
206 select EXYNOS4_DEV_PD
205 select EXYNOS4_SETUP_I2C1 207 select EXYNOS4_SETUP_I2C1
206 select EXYNOS4_SETUP_I2C3 208 select EXYNOS4_SETUP_I2C3
207 select EXYNOS4_SETUP_I2C5 209 select EXYNOS4_SETUP_I2C5
diff --git a/arch/arm/mach-exynos4/mach-nuri.c b/arch/arm/mach-exynos4/mach-nuri.c
index 1920906acd2f..43be71b799cb 100644
--- a/arch/arm/mach-exynos4/mach-nuri.c
+++ b/arch/arm/mach-exynos4/mach-nuri.c
@@ -41,6 +41,8 @@
41#include <plat/clock.h> 41#include <plat/clock.h>
42#include <plat/gpio-cfg.h> 42#include <plat/gpio-cfg.h>
43#include <plat/iic.h> 43#include <plat/iic.h>
44#include <plat/mfc.h>
45#include <plat/pd.h>
44 46
45#include <mach/map.h> 47#include <mach/map.h>
46 48
@@ -1100,6 +1102,10 @@ static struct platform_device *nuri_devices[] __initdata = {
1100 &i2c9_gpio, 1102 &i2c9_gpio,
1101 &s3c_device_adc, 1103 &s3c_device_adc,
1102 &s3c_device_rtc, 1104 &s3c_device_rtc,
1105 &s5p_device_mfc,
1106 &s5p_device_mfc_l,
1107 &s5p_device_mfc_r,
1108 &exynos4_device_pd[PD_MFC],
1103 1109
1104 /* NURI Devices */ 1110 /* NURI Devices */
1105 &nuri_gpio_keys, 1111 &nuri_gpio_keys,
@@ -1116,6 +1122,11 @@ static void __init nuri_map_io(void)
1116 s3c24xx_init_uarts(nuri_uartcfgs, ARRAY_SIZE(nuri_uartcfgs)); 1122 s3c24xx_init_uarts(nuri_uartcfgs, ARRAY_SIZE(nuri_uartcfgs));
1117} 1123}
1118 1124
1125static void __init nuri_reserve(void)
1126{
1127 s5p_mfc_reserve_mem(0x43000000, 8 << 20, 0x51000000, 8 << 20);
1128}
1129
1119static void __init nuri_machine_init(void) 1130static void __init nuri_machine_init(void)
1120{ 1131{
1121 nuri_sdhci_init(); 1132 nuri_sdhci_init();
@@ -1136,6 +1147,7 @@ static void __init nuri_machine_init(void)
1136 1147
1137 /* Last */ 1148 /* Last */
1138 platform_add_devices(nuri_devices, ARRAY_SIZE(nuri_devices)); 1149 platform_add_devices(nuri_devices, ARRAY_SIZE(nuri_devices));
1150 s5p_device_mfc.dev.parent = &exynos4_device_pd[PD_MFC].dev;
1139} 1151}
1140 1152
1141MACHINE_START(NURI, "NURI") 1153MACHINE_START(NURI, "NURI")
@@ -1145,4 +1157,5 @@ MACHINE_START(NURI, "NURI")
1145 .map_io = nuri_map_io, 1157 .map_io = nuri_map_io,
1146 .init_machine = nuri_machine_init, 1158 .init_machine = nuri_machine_init,
1147 .timer = &exynos4_timer, 1159 .timer = &exynos4_timer,
1160 .reserve = &nuri_reserve,
1148MACHINE_END 1161MACHINE_END