diff options
Diffstat (limited to 'arch/arm/mach-exynos/mach-nuri.c')
-rw-r--r-- | arch/arm/mach-exynos/mach-nuri.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c index 236bbe187163..97cd5af15055 100644 --- a/arch/arm/mach-exynos/mach-nuri.c +++ b/arch/arm/mach-exynos/mach-nuri.c | |||
@@ -37,7 +37,6 @@ | |||
37 | #include <plat/adc.h> | 37 | #include <plat/adc.h> |
38 | #include <plat/regs-fb-v4.h> | 38 | #include <plat/regs-fb-v4.h> |
39 | #include <plat/regs-serial.h> | 39 | #include <plat/regs-serial.h> |
40 | #include <plat/exynos4.h> | ||
41 | #include <plat/cpu.h> | 40 | #include <plat/cpu.h> |
42 | #include <plat/devs.h> | 41 | #include <plat/devs.h> |
43 | #include <plat/fb.h> | 42 | #include <plat/fb.h> |
@@ -54,6 +53,8 @@ | |||
54 | 53 | ||
55 | #include <mach/map.h> | 54 | #include <mach/map.h> |
56 | 55 | ||
56 | #include "common.h" | ||
57 | |||
57 | /* Following are default values for UCON, ULCON and UFCON UART registers */ | 58 | /* Following are default values for UCON, ULCON and UFCON UART registers */ |
58 | #define NURI_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ | 59 | #define NURI_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ |
59 | S3C2410_UCON_RXILEVEL | \ | 60 | S3C2410_UCON_RXILEVEL | \ |
@@ -1283,7 +1284,7 @@ static struct platform_device *nuri_devices[] __initdata = { | |||
1283 | 1284 | ||
1284 | static void __init nuri_map_io(void) | 1285 | static void __init nuri_map_io(void) |
1285 | { | 1286 | { |
1286 | s5p_init_io(NULL, 0, S5P_VA_CHIPID); | 1287 | exynos_init_io(NULL, 0); |
1287 | s3c24xx_init_clocks(24000000); | 1288 | s3c24xx_init_clocks(24000000); |
1288 | s3c24xx_init_uarts(nuri_uartcfgs, ARRAY_SIZE(nuri_uartcfgs)); | 1289 | s3c24xx_init_uarts(nuri_uartcfgs, ARRAY_SIZE(nuri_uartcfgs)); |
1289 | } | 1290 | } |