diff options
Diffstat (limited to 'arch/arm/mach-s5p6442/include')
-rw-r--r-- | arch/arm/mach-s5p6442/include/mach/irqs.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-s5p6442/include/mach/map.h | 3 | ||||
-rw-r--r-- | arch/arm/mach-s5p6442/include/mach/system.h | 7 |
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-s5p6442/include/mach/irqs.h b/arch/arm/mach-s5p6442/include/mach/irqs.h index 02c23749c02..3fbc6c3ad2d 100644 --- a/arch/arm/mach-s5p6442/include/mach/irqs.h +++ b/arch/arm/mach-s5p6442/include/mach/irqs.h | |||
@@ -32,7 +32,7 @@ | |||
32 | #define IRQ_GPIOINT S5P_IRQ_VIC0(30) | 32 | #define IRQ_GPIOINT S5P_IRQ_VIC0(30) |
33 | 33 | ||
34 | /* VIC1 */ | 34 | /* VIC1 */ |
35 | #define IRQ_nPMUIRQ S5P_IRQ_VIC1(0) | 35 | #define IRQ_PMU S5P_IRQ_VIC1(0) |
36 | #define IRQ_ONENAND S5P_IRQ_VIC1(7) | 36 | #define IRQ_ONENAND S5P_IRQ_VIC1(7) |
37 | #define IRQ_UART0 S5P_IRQ_VIC1(10) | 37 | #define IRQ_UART0 S5P_IRQ_VIC1(10) |
38 | #define IRQ_UART1 S5P_IRQ_VIC1(11) | 38 | #define IRQ_UART1 S5P_IRQ_VIC1(11) |
diff --git a/arch/arm/mach-s5p6442/include/mach/map.h b/arch/arm/mach-s5p6442/include/mach/map.h index 32ca424ef7f..281d256faaf 100644 --- a/arch/arm/mach-s5p6442/include/mach/map.h +++ b/arch/arm/mach-s5p6442/include/mach/map.h | |||
@@ -42,6 +42,8 @@ | |||
42 | 42 | ||
43 | #define S5P6442_PA_SYSTIMER (0xEA100000) | 43 | #define S5P6442_PA_SYSTIMER (0xEA100000) |
44 | 44 | ||
45 | #define S5P6442_PA_WATCHDOG (0xEA200000) | ||
46 | |||
45 | #define S5P6442_PA_UART (0xEC000000) | 47 | #define S5P6442_PA_UART (0xEC000000) |
46 | 48 | ||
47 | #define S5P_PA_UART0 (S5P6442_PA_UART + 0x0) | 49 | #define S5P_PA_UART0 (S5P6442_PA_UART + 0x0) |
@@ -65,6 +67,7 @@ | |||
65 | #define S5P6442_PA_PCM1 0xF2500000 | 67 | #define S5P6442_PA_PCM1 0xF2500000 |
66 | 68 | ||
67 | /* compatibiltiy defines. */ | 69 | /* compatibiltiy defines. */ |
70 | #define S3C_PA_WDT S5P6442_PA_WATCHDOG | ||
68 | #define S3C_PA_UART S5P6442_PA_UART | 71 | #define S3C_PA_UART S5P6442_PA_UART |
69 | #define S3C_PA_IIC S5P6442_PA_IIC0 | 72 | #define S3C_PA_IIC S5P6442_PA_IIC0 |
70 | 73 | ||
diff --git a/arch/arm/mach-s5p6442/include/mach/system.h b/arch/arm/mach-s5p6442/include/mach/system.h index 8bcd8ed0c3c..c30c1cc1b97 100644 --- a/arch/arm/mach-s5p6442/include/mach/system.h +++ b/arch/arm/mach-s5p6442/include/mach/system.h | |||
@@ -13,12 +13,9 @@ | |||
13 | #ifndef __ASM_ARCH_SYSTEM_H | 13 | #ifndef __ASM_ARCH_SYSTEM_H |
14 | #define __ASM_ARCH_SYSTEM_H __FILE__ | 14 | #define __ASM_ARCH_SYSTEM_H __FILE__ |
15 | 15 | ||
16 | static void arch_idle(void) | 16 | #include <plat/system-reset.h> |
17 | { | ||
18 | /* nothing here yet */ | ||
19 | } | ||
20 | 17 | ||
21 | static void arch_reset(char mode, const char *cmd) | 18 | static void arch_idle(void) |
22 | { | 19 | { |
23 | /* nothing here yet */ | 20 | /* nothing here yet */ |
24 | } | 21 | } |