Merge branch 'samsung/cleanup' into samsung/driver

Conflicts:
	arch/arm/mach-s5p64x0/cpu.c -> common.c

More changes to a file that got moved into common.c,
see previous conflict resolutions.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 6 insertions, 2 deletions

diff --git a/arch/arm/mach-s5p64x0/mach-smdk6450.c b/arch/arm/mach-s5p64x0/mach-smdk6450.c
index 242a415dcf6b..efb69e2f2afe 100644
--- a/arch/arm/mach-s5p64x0/mach-smdk6450.c
+++ b/arch/arm/mach-s5p64x0/mach-smdk6450.c
@@ -28,6 +28,7 @@
 
 #include <video/platform_lcd.h>
 
+#include <asm/hardware/vic.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/irq.h>
@@ -41,7 +42,6 @@
 
 #include <plat/regs-serial.h>
 #include <plat/gpio-cfg.h>
-#include <plat/s5p6450.h>
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
@@ -55,6 +55,8 @@
 #include <plat/regs-fb.h>
 #include <plat/sdhci.h>
 
+#include "common.h"
+
 #define SMDK6450_UCON_DEFAULT   (S3C2410_UCON_TXILEVEL |        \
                                 S3C2410_UCON_RXILEVEL |         \
                                 S3C2410_UCON_TXIRQMODE |        \
@@ -241,7 +243,7 @@ static struct platform_pwm_backlight_data smdk6450_bl_data = {
 
 static void __init smdk6450_map_io(void)
 {
-        s5p_init_io(NULL, 0, S5P64X0_SYS_ID);
+        s5p64x0_init_io(NULL, 0);
         s3c24xx_init_clocks(19200000);
         s3c24xx_init_uarts(smdk6450_uartcfgs, ARRAY_SIZE(smdk6450_uartcfgs));
         s5p_set_timer_source(S5P_PWM3, S5P_PWM4);
@@ -286,7 +288,9 @@ MACHINE_START(SMDK6450, "SMDK6450")
         .atag_offset    = 0x100,
 
         .init_irq       = s5p6450_init_irq,
+        .handle_irq     = vic_handle_irq,
         .map_io         = smdk6450_map_io,
         .init_machine   = smdk6450_machine_init,
         .timer          = &s5p_timer,
+        .restart        = s5p64x0_restart,
 MACHINE_END