From cc511b8d84d88ab788cddbfe8d21485b1c387493 Mon Sep 17 00:00:00 2001 From: Kukjin Kim Date: Tue, 27 Dec 2011 08:18:36 +0100 Subject: ARM: 7257/1: EXYNOS: introduce arch/arm/mach-exynos/common.[ch] This patch introduces common.[ch] which are used only in the arch/arm/mach-exynos/ directory. The common.c file merges the cpu.c, init.c, irq-combiner.c and irq-eint.c files which are used commonly on EXYNOS SoCs and the common.h file replaces with plat/exynos4.h file. Cc: Ben Dooks Signed-off-by: Kukjin Kim Signed-off-by: Russell King --- arch/arm/mach-exynos/mach-origen.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'arch/arm/mach-exynos/mach-origen.c') 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 @@ #include #include -#include #include #include #include @@ -43,6 +42,8 @@ #include +#include "common.h" + /* Following are default values for UCON, ULCON and UFCON UART registers */ #define ORIGEN_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ S3C2410_UCON_RXILEVEL | \ @@ -638,7 +639,7 @@ static void s5p_tv_setup(void) static void __init origen_map_io(void) { - s5p_init_io(NULL, 0, S5P_VA_CHIPID); + exynos_init_io(NULL, 0); s3c24xx_init_clocks(24000000); s3c24xx_init_uarts(origen_uartcfgs, ARRAY_SIZE(origen_uartcfgs)); } -- cgit v1.2.3 From 9eb4859564d6e104f78abde15e7f0ca996b71236 Mon Sep 17 00:00:00 2001 From: Russell King Date: Tue, 3 Jan 2012 11:56:53 +0100 Subject: ARM: 7262/1: restart: EXYNOS: use new restart hook Hook these platforms restart code into the new restart hook rather than using arch_reset(). [kgene.kim@samsung.com: according to local header, updated] Signed-off-by: Kukjin Kim Signed-off-by: Russell King --- arch/arm/mach-exynos/mach-origen.c | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm/mach-exynos/mach-origen.c') diff --git a/arch/arm/mach-exynos/mach-origen.c b/arch/arm/mach-exynos/mach-origen.c index cc2c67082769..9536b3356919 100644 --- a/arch/arm/mach-exynos/mach-origen.c +++ b/arch/arm/mach-exynos/mach-origen.c @@ -698,4 +698,5 @@ MACHINE_START(ORIGEN, "ORIGEN") .init_machine = origen_machine_init, .timer = &exynos4_timer, .reserve = &origen_reserve, + .restart = exynos4_restart, MACHINE_END -- cgit v1.2.3