diff options
Diffstat (limited to 'arch/arm/mach-aspeed/include/mach')
| -rwxr-xr-x | arch/arm/mach-aspeed/include/mach/ast_wdt.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-aspeed/include/mach/debug-macro.S | 5 | ||||
| -rw-r--r-- | arch/arm/mach-aspeed/include/mach/system.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-aspeed/include/mach/uncompress.h | 4 | ||||
| -rw-r--r-- | arch/arm/mach-aspeed/include/mach/vmalloc.h | 2 |
5 files changed, 7 insertions, 8 deletions
diff --git a/arch/arm/mach-aspeed/include/mach/ast_wdt.h b/arch/arm/mach-aspeed/include/mach/ast_wdt.h index 6d7d7f470b11..f9125a112fa2 100755 --- a/arch/arm/mach-aspeed/include/mach/ast_wdt.h +++ b/arch/arm/mach-aspeed/include/mach/ast_wdt.h @@ -8,4 +8,4 @@ * your option) any later version.
*/
- extern void ast_soc_wdt_reset(void);
+ extern void ast_wdt_reset_full(void); diff --git a/arch/arm/mach-aspeed/include/mach/debug-macro.S b/arch/arm/mach-aspeed/include/mach/debug-macro.S index 0b7c9278b9b0..ff3195ac820f 100644 --- a/arch/arm/mach-aspeed/include/mach/debug-macro.S +++ b/arch/arm/mach-aspeed/include/mach/debug-macro.S @@ -13,9 +13,8 @@ .macro addruart, rx, tmp mrc p15, 0, \rx, c1, c0 tst \rx, #1 @ MMU enabled? - ldreq \rx, =AST_UART0_BASE - ldrne \rx, =IO_ADDRESS(AST_UART0_BASE) - orr \rx, \rx, #0x00012000 + ldreq \rx, =AST_UART3_BASE + ldrne \rx, =IO_ADDRESS(AST_UART3_BASE) .endm #define UART_SHIFT 2 diff --git a/arch/arm/mach-aspeed/include/mach/system.h b/arch/arm/mach-aspeed/include/mach/system.h index 96e90dad52fc..926268b948e1 100644 --- a/arch/arm/mach-aspeed/include/mach/system.h +++ b/arch/arm/mach-aspeed/include/mach/system.h @@ -37,7 +37,7 @@ static inline void arch_reset(char mode) * Use WDT to restart system */ #if defined(CONFIG_AST_WATCHDOG) || defined(CONFIG_AST_WATCHDOG_MODULE) - ast_soc_wdt_reset(); + ast_wdt_reset_full(); #endif } diff --git a/arch/arm/mach-aspeed/include/mach/uncompress.h b/arch/arm/mach-aspeed/include/mach/uncompress.h index 896b8542a530..80e560db4033 100644 --- a/arch/arm/mach-aspeed/include/mach/uncompress.h +++ b/arch/arm/mach-aspeed/include/mach/uncompress.h @@ -12,8 +12,8 @@ #include <mach/platform.h> #include <mach/aspeed_serial.h> -#define UART_PUT_CHAR (*(volatile unsigned char *)(AST_UART0_BASE + UART_THR)) -#define UART_GET_LSR (*(volatile unsigned char *)(AST_UART0_BASE + UART_LSR)) +#define UART_PUT_CHAR (*(volatile unsigned char *)(AST_UART3_BASE + UART_THR)) +#define UART_GET_LSR (*(volatile unsigned char *)(AST_UART3_BASE + UART_LSR)) static void putc(int c) { diff --git a/arch/arm/mach-aspeed/include/mach/vmalloc.h b/arch/arm/mach-aspeed/include/mach/vmalloc.h index 3706cf1f168e..51912aefaa38 100644 --- a/arch/arm/mach-aspeed/include/mach/vmalloc.h +++ b/arch/arm/mach-aspeed/include/mach/vmalloc.h @@ -23,7 +23,7 @@ #define VMALLOC_OFFSET (8*1024*1024) #define VMALLOC_START (((unsigned long)high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1)) #define VMALLOC_VMADDR(x) ((unsigned long)(x)) -#define VMALLOC_END (PAGE_OFFSET + 0x10000000) +#define VMALLOC_END (PAGE_OFFSET + 0x20000000) #else #define VMALLOC_END 0xf8000000UL #endif
\ No newline at end of file |