Merge branch 'next-s5p' into for-next

Conflicts:
	arch/arm/mach-s5pv210/mach-aquila.c
	arch/arm/mach-s5pv210/mach-goni.c

3 files changed, 15 insertions, 18 deletions

diff --git a/arch/arm/mach-s5p6442/include/mach/irqs.h b/arch/arm/mach-s5p6442/include/mach/irqs.h
index 02c23749c023..3fbc6c3ad2da 100644
--- a/arch/arm/mach-s5p6442/include/mach/irqs.h
+++ b/arch/arm/mach-s5p6442/include/mach/irqs.h
@@ -32,7 +32,7 @@
 #define IRQ_GPIOINT             S5P_IRQ_VIC0(30)
 
 /* VIC1 */
-#define IRQ_nPMUIRQ             S5P_IRQ_VIC1(0)
+#define IRQ_PMU                 S5P_IRQ_VIC1(0)
 #define IRQ_ONENAND             S5P_IRQ_VIC1(7)
 #define IRQ_UART0               S5P_IRQ_VIC1(10)
 #define IRQ_UART1               S5P_IRQ_VIC1(11)
diff --git a/arch/arm/mach-s5p6442/include/mach/system.h b/arch/arm/mach-s5p6442/include/mach/system.h
index 8bcd8ed0c3c3..c30c1cc1b97e 100644
--- a/arch/arm/mach-s5p6442/include/mach/system.h
+++ b/arch/arm/mach-s5p6442/include/mach/system.h
@@ -13,12 +13,9 @@
 #ifndef __ASM_ARCH_SYSTEM_H
 #define __ASM_ARCH_SYSTEM_H __FILE__
 
-static void arch_idle(void)
-{
-        /* nothing here yet */
-}
+#include <plat/system-reset.h>
 
-static void arch_reset(char mode, const char *cmd)
+static void arch_idle(void)
 {
         /* nothing here yet */
 }
diff --git a/arch/arm/mach-s5p6442/mach-smdk6442.c b/arch/arm/mach-s5p6442/mach-smdk6442.c
index 6e061bec6b74..8d8d04272f85 100644
--- a/arch/arm/mach-s5p6442/mach-smdk6442.c
+++ b/arch/arm/mach-s5p6442/mach-smdk6442.c
@@ -27,16 +27,16 @@
 #include <plat/cpu.h>
 
 /* Following are default values for UCON, ULCON and UFCON UART registers */
-#define S5P6442_UCON_DEFAULT    (S3C2410_UCON_TXILEVEL |        \
+#define SMDK6442_UCON_DEFAULT   (S3C2410_UCON_TXILEVEL |        \
                                  S3C2410_UCON_RXILEVEL |        \
                                  S3C2410_UCON_TXIRQMODE |       \
                                  S3C2410_UCON_RXIRQMODE |       \
                                  S3C2410_UCON_RXFIFO_TOI |      \
                                  S3C2443_UCON_RXERR_IRQEN)
 
-#define S5P6442_ULCON_DEFAULT   S3C2410_LCON_CS8
+#define SMDK6442_ULCON_DEFAULT  S3C2410_LCON_CS8
 
-#define S5P6442_UFCON_DEFAULT   (S3C2410_UFCON_FIFOMODE |       \
+#define SMDK6442_UFCON_DEFAULT  (S3C2410_UFCON_FIFOMODE |       \
                                  S5PV210_UFCON_TXTRIG4 |        \
                                  S5PV210_UFCON_RXTRIG4)
 
@@ -44,23 +44,23 @@ static struct s3c2410_uartcfg smdk6442_uartcfgs[] __initdata = {
         [0] = {
                 .hwport         = 0,
                 .flags          = 0,
-                .ucon           = S5P6442_UCON_DEFAULT,
-                .ulcon          = S5P6442_ULCON_DEFAULT,
-                .ufcon          = S5P6442_UFCON_DEFAULT,
+                .ucon           = SMDK6442_UCON_DEFAULT,
+                .ulcon          = SMDK6442_ULCON_DEFAULT,
+                .ufcon          = SMDK6442_UFCON_DEFAULT,
         },
         [1] = {
                 .hwport         = 1,
                 .flags          = 0,
-                .ucon           = S5P6442_UCON_DEFAULT,
-                .ulcon          = S5P6442_ULCON_DEFAULT,
-                .ufcon          = S5P6442_UFCON_DEFAULT,
+                .ucon           = SMDK6442_UCON_DEFAULT,
+                .ulcon          = SMDK6442_ULCON_DEFAULT,
+                .ufcon          = SMDK6442_UFCON_DEFAULT,
         },
         [2] = {
                 .hwport         = 2,
                 .flags          = 0,
-                .ucon           = S5P6442_UCON_DEFAULT,
-                .ulcon          = S5P6442_ULCON_DEFAULT,
-                .ufcon          = S5P6442_UFCON_DEFAULT,
+                .ucon           = SMDK6442_UCON_DEFAULT,
+                .ulcon          = SMDK6442_ULCON_DEFAULT,
+                .ufcon          = SMDK6442_UFCON_DEFAULT,
         },
 };