diff options
Diffstat (limited to 'arch/arm/mach-exynos/mach-origen.c')
-rw-r--r-- | arch/arm/mach-exynos/mach-origen.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-exynos/mach-origen.c b/arch/arm/mach-exynos/mach-origen.c index f80b563f2be7..cc2c67082769 100644 --- a/arch/arm/mach-exynos/mach-origen.c +++ b/arch/arm/mach-exynos/mach-origen.c | |||
@@ -28,7 +28,6 @@ | |||
28 | 28 | ||
29 | #include <plat/regs-serial.h> | 29 | #include <plat/regs-serial.h> |
30 | #include <plat/regs-fb-v4.h> | 30 | #include <plat/regs-fb-v4.h> |
31 | #include <plat/exynos4.h> | ||
32 | #include <plat/cpu.h> | 31 | #include <plat/cpu.h> |
33 | #include <plat/devs.h> | 32 | #include <plat/devs.h> |
34 | #include <plat/sdhci.h> | 33 | #include <plat/sdhci.h> |
@@ -43,6 +42,8 @@ | |||
43 | 42 | ||
44 | #include <mach/map.h> | 43 | #include <mach/map.h> |
45 | 44 | ||
45 | #include "common.h" | ||
46 | |||
46 | /* Following are default values for UCON, ULCON and UFCON UART registers */ | 47 | /* Following are default values for UCON, ULCON and UFCON UART registers */ |
47 | #define ORIGEN_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ | 48 | #define ORIGEN_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ |
48 | S3C2410_UCON_RXILEVEL | \ | 49 | S3C2410_UCON_RXILEVEL | \ |
@@ -638,7 +639,7 @@ static void s5p_tv_setup(void) | |||
638 | 639 | ||
639 | static void __init origen_map_io(void) | 640 | static void __init origen_map_io(void) |
640 | { | 641 | { |
641 | s5p_init_io(NULL, 0, S5P_VA_CHIPID); | 642 | exynos_init_io(NULL, 0); |
642 | s3c24xx_init_clocks(24000000); | 643 | s3c24xx_init_clocks(24000000); |
643 | s3c24xx_init_uarts(origen_uartcfgs, ARRAY_SIZE(origen_uartcfgs)); | 644 | s3c24xx_init_uarts(origen_uartcfgs, ARRAY_SIZE(origen_uartcfgs)); |
644 | } | 645 | } |