6 files changed, 38 insertions, 12 deletions

diff --git a/arch/arm/mach-s5pv210/include/mach/gpio.h b/arch/arm/mach-s5pv210/include/mach/gpio.h
index d6461ba2b71d..1f4b595534c2 100644
--- a/arch/arm/mach-s5pv210/include/mach/gpio.h
+++ b/arch/arm/mach-s5pv210/include/mach/gpio.h
@@ -52,6 +52,8 @@
 #define S5PV210_GPIO_MP01_NR    (8)
 #define S5PV210_GPIO_MP02_NR    (4)
 #define S5PV210_GPIO_MP03_NR    (8)
+#define S5PV210_GPIO_MP04_NR    (8)
+#define S5PV210_GPIO_MP05_NR    (8)
 
 /* GPIO bank numbers */
 
@@ -94,6 +96,8 @@ enum s5p_gpio_number {
         S5PV210_GPIO_MP01_START = S5PV210_GPIO_NEXT(S5PV210_GPIO_J4),
         S5PV210_GPIO_MP02_START = S5PV210_GPIO_NEXT(S5PV210_GPIO_MP01),
         S5PV210_GPIO_MP03_START = S5PV210_GPIO_NEXT(S5PV210_GPIO_MP02),
+        S5PV210_GPIO_MP04_START = S5PV210_GPIO_NEXT(S5PV210_GPIO_MP03),
+        S5PV210_GPIO_MP05_START = S5PV210_GPIO_NEXT(S5PV210_GPIO_MP04),
 };
 
 /* S5PV210 GPIO number definitions */
@@ -127,13 +131,15 @@ enum s5p_gpio_number {
 #define S5PV210_MP01(_nr)       (S5PV210_GPIO_MP01_START + (_nr))
 #define S5PV210_MP02(_nr)       (S5PV210_GPIO_MP02_START + (_nr))
 #define S5PV210_MP03(_nr)       (S5PV210_GPIO_MP03_START + (_nr))
+#define S5PV210_MP04(_nr)       (S5PV210_GPIO_MP04_START + (_nr))
+#define S5PV210_MP05(_nr)       (S5PV210_GPIO_MP05_START + (_nr))
 
 /* the end of the S5PV210 specific gpios */
-#define S5PV210_GPIO_END        (S5PV210_MP03(S5PV210_GPIO_MP03_NR) + 1)
+#define S5PV210_GPIO_END        (S5PV210_MP05(S5PV210_GPIO_MP05_NR) + 1)
 #define S3C_GPIO_END            S5PV210_GPIO_END
 
-/* define the number of gpios we need to the one after the MP03() range */
-#define ARCH_NR_GPIOS           (S5PV210_MP03(S5PV210_GPIO_MP03_NR) +   \
+/* define the number of gpios we need to the one after the MP05() range */
+#define ARCH_NR_GPIOS           (S5PV210_MP05(S5PV210_GPIO_MP05_NR) +   \
                                  CONFIG_SAMSUNG_GPIO_EXTRA + 1)
 
 #include <asm-generic/gpio.h>
diff --git a/arch/arm/mach-s5pv210/include/mach/irqs.h b/arch/arm/mach-s5pv210/include/mach/irqs.h
index 96895378ea27..e1c020e5a49b 100644
--- a/arch/arm/mach-s5pv210/include/mach/irqs.h
+++ b/arch/arm/mach-s5pv210/include/mach/irqs.h
@@ -36,7 +36,7 @@
 
 /* VIC1: ARM, Power, Memory, Connectivity, Storage */
 
-#define IRQ_CORTEX0             S5P_IRQ_VIC1(0)
+#define IRQ_PMU                 S5P_IRQ_VIC1(0)
 #define IRQ_CORTEX1             S5P_IRQ_VIC1(1)
 #define IRQ_CORTEX2             S5P_IRQ_VIC1(2)
 #define IRQ_CORTEX3             S5P_IRQ_VIC1(3)
@@ -45,7 +45,7 @@
 #define IRQ_IEMIEC              S5P_IRQ_VIC1(6)
 #define IRQ_ONENAND             S5P_IRQ_VIC1(7)
 #define IRQ_NFC                 S5P_IRQ_VIC1(8)
-#define IRQ_CFC                 S5P_IRQ_VIC1(9)
+#define IRQ_CFCON               S5P_IRQ_VIC1(9)
 #define IRQ_UART0               S5P_IRQ_VIC1(10)
 #define IRQ_UART1               S5P_IRQ_VIC1(11)
 #define IRQ_UART2               S5P_IRQ_VIC1(12)
diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-s5pv210/include/mach/map.h
index 34eb168ec950..dd4fb6bf14b5 100644
--- a/arch/arm/mach-s5pv210/include/mach/map.h
+++ b/arch/arm/mach-s5pv210/include/mach/map.h
@@ -32,6 +32,8 @@
 #define S5PV210_PA_SPI0         0xE1300000
 #define S5PV210_PA_SPI1         0xE1400000
 
+#define S5PV210_PA_KEYPAD       (0xE1600000)
+
 #define S5PV210_PA_IIC0         (0xE1800000)
 #define S5PV210_PA_IIC1         (0xFAB00000)
 #define S5PV210_PA_IIC2         (0xE1A00000)
@@ -43,6 +45,7 @@
 
 #define S5PV210_PA_WATCHDOG     (0xE2700000)
 
+#define S5PV210_PA_RTC          (0xE2800000)
 #define S5PV210_PA_UART         (0xE2900000)
 
 #define S5P_PA_UART0            (S5PV210_PA_UART + 0x0)
@@ -54,12 +57,18 @@
 
 #define S5PV210_PA_SROMC        (0xE8000000)
 
+#define S5PV210_PA_CFCON        (0xE8200000)
+
 #define S5PV210_PA_MDMA         0xFA200000
 #define S5PV210_PA_PDMA0        0xE0900000
 #define S5PV210_PA_PDMA1        0xE0A00000
 
 #define S5PV210_PA_FB           (0xF8000000)
 
+#define S5PV210_PA_FIMC0        (0xFB200000)
+#define S5PV210_PA_FIMC1        (0xFB300000)
+#define S5PV210_PA_FIMC2        (0xFB400000)
+
 #define S5PV210_PA_HSMMC(x)     (0xEB000000 + ((x) * 0x100000))
 
 #define S5PV210_PA_VIC0         (0xF2000000)
@@ -97,12 +106,19 @@
 #define S3C_PA_HSMMC0           S5PV210_PA_HSMMC(0)
 #define S3C_PA_HSMMC1           S5PV210_PA_HSMMC(1)
 #define S3C_PA_HSMMC2           S5PV210_PA_HSMMC(2)
+#define S3C_PA_HSMMC3           S5PV210_PA_HSMMC(3)
 #define S3C_PA_IIC              S5PV210_PA_IIC0
 #define S3C_PA_IIC1             S5PV210_PA_IIC1
 #define S3C_PA_IIC2             S5PV210_PA_IIC2
 #define S3C_PA_FB               S5PV210_PA_FB
+#define S3C_PA_RTC              S5PV210_PA_RTC
 #define S3C_PA_WDT              S5PV210_PA_WATCHDOG
+#define S5P_PA_FIMC0            S5PV210_PA_FIMC0
+#define S5P_PA_FIMC1            S5PV210_PA_FIMC1
+#define S5P_PA_FIMC2            S5PV210_PA_FIMC2
 
 #define SAMSUNG_PA_ADC          S5PV210_PA_ADC
+#define SAMSUNG_PA_CFCON        S5PV210_PA_CFCON
+#define SAMSUNG_PA_KEYPAD       S5PV210_PA_KEYPAD
 
 #endif /* __ASM_ARCH_MAP_H */
diff --git a/arch/arm/mach-s5pv210/include/mach/memory.h b/arch/arm/mach-s5pv210/include/mach/memory.h
index 379117e27600..d503e0c4ce4f 100644
--- a/arch/arm/mach-s5pv210/include/mach/memory.h
+++ b/arch/arm/mach-s5pv210/include/mach/memory.h
@@ -16,8 +16,13 @@
 #define PHYS_OFFSET             UL(0x20000000)
 #define CONSISTENT_DMA_SIZE     (SZ_8M + SZ_4M + SZ_2M)
 
-/* Maximum of 256MiB in one bank */
-#define MAX_PHYSMEM_BITS        32
+/*
+ * Sparsemem support
+ * Physical memory can be located from 0x20000000 to 0x7fffffff,
+ * so MAX_PHYSMEM_BITS is 31.
+ */
+
+#define MAX_PHYSMEM_BITS        31
 #define SECTION_SIZE_BITS       28
 
 #endif /* __ASM_ARCH_MEMORY_H */
diff --git a/arch/arm/mach-s5pv210/include/mach/regs-clock.h b/arch/arm/mach-s5pv210/include/mach/regs-clock.h
index 2a25ab40c863..499aef737476 100644
--- a/arch/arm/mach-s5pv210/include/mach/regs-clock.h
+++ b/arch/arm/mach-s5pv210/include/mach/regs-clock.h
@@ -90,6 +90,8 @@
 #define S5P_CLKDIV0_PCLK66_SHIFT        (28)
 #define S5P_CLKDIV0_PCLK66_MASK         (0x7 << S5P_CLKDIV0_PCLK66_SHIFT)
 
+#define S5P_SWRESET             S5P_CLKREG(0x2000)
+
 /* Registers related to power management */
 #define S5P_PWR_CFG             S5P_CLKREG(0xC000)
 #define S5P_EINT_WAKEUP_MASK    S5P_CLKREG(0xC004)
diff --git a/arch/arm/mach-s5pv210/include/mach/system.h b/arch/arm/mach-s5pv210/include/mach/system.h
index 1ca04d5025b3..af8a200b2135 100644
--- a/arch/arm/mach-s5pv210/include/mach/system.h
+++ b/arch/arm/mach-s5pv210/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 */
 }