aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorKamil Debski <k.debski@samsung.com>2011-07-21 03:43:14 -0400
committerKukjin Kim <kgene.kim@samsung.com>2011-07-21 04:29:08 -0400
commit66eb1238deb06f3bc1185c31cf0ee68d75fb7385 (patch)
treec34bd3d7b1a91a47e3ec62e5503b93055a35e547 /arch
parent0f75a96bc0c4611dea0c7207533f822315120054 (diff)
ARM: S5PV210: Enable MFC on Goni
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')
-rw-r--r--arch/arm/mach-s5pv210/Kconfig1
-rw-r--r--arch/arm/mach-s5pv210/mach-goni.c11
2 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index 37b5a97594a5..a06acce7b731 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -90,6 +90,7 @@ config MACH_GONI
90 select S3C_DEV_HSMMC2 90 select S3C_DEV_HSMMC2
91 select S3C_DEV_I2C1 91 select S3C_DEV_I2C1
92 select S3C_DEV_I2C2 92 select S3C_DEV_I2C2
93 select S5P_DEV_MFC
93 select S3C_DEV_USB_HSOTG 94 select S3C_DEV_USB_HSOTG
94 select S5P_DEV_ONENAND 95 select S5P_DEV_ONENAND
95 select SAMSUNG_DEV_KEYPAD 96 select SAMSUNG_DEV_KEYPAD
diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c
index 31d5aa769753..e9b1406cb566 100644
--- a/arch/arm/mach-s5pv210/mach-goni.c
+++ b/arch/arm/mach-s5pv210/mach-goni.c
@@ -47,6 +47,8 @@
47#include <plat/sdhci.h> 47#include <plat/sdhci.h>
48#include <plat/clock.h> 48#include <plat/clock.h>
49#include <plat/s5p-time.h> 49#include <plat/s5p-time.h>
50#include <plat/mfc.h>
51#include <plat/regs-fb-v4.h>
50 52
51/* Following are default values for UCON, ULCON and UFCON UART registers */ 53/* Following are default values for UCON, ULCON and UFCON UART registers */
52#define GONI_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ 54#define GONI_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \
@@ -808,6 +810,9 @@ static struct platform_device *goni_devices[] __initdata = {
808 &goni_i2c_gpio5, 810 &goni_i2c_gpio5,
809 &mmc2_fixed_voltage, 811 &mmc2_fixed_voltage,
810 &goni_device_gpiokeys, 812 &goni_device_gpiokeys,
813 &s5p_device_mfc,
814 &s5p_device_mfc_l,
815 &s5p_device_mfc_r,
811 &s3c_device_i2c0, 816 &s3c_device_i2c0,
812 &s5p_device_fimc0, 817 &s5p_device_fimc0,
813 &s5p_device_fimc1, 818 &s5p_device_fimc1,
@@ -841,6 +846,11 @@ static void __init goni_map_io(void)
841 s5p_set_timer_source(S5P_PWM3, S5P_PWM4); 846 s5p_set_timer_source(S5P_PWM3, S5P_PWM4);
842} 847}
843 848
849static void __init goni_reserve(void)
850{
851 s5p_mfc_reserve_mem(0x43000000, 8 << 20, 0x51000000, 8 << 20);
852}
853
844static void __init goni_machine_init(void) 854static void __init goni_machine_init(void)
845{ 855{
846 /* Radio: call before I2C 1 registeration */ 856 /* Radio: call before I2C 1 registeration */
@@ -893,4 +903,5 @@ MACHINE_START(GONI, "GONI")
893 .map_io = goni_map_io, 903 .map_io = goni_map_io,
894 .init_machine = goni_machine_init, 904 .init_machine = goni_machine_init,
895 .timer = &s5p_timer, 905 .timer = &s5p_timer,
906 .reserve = &goni_reserve,
896MACHINE_END 907MACHINE_END