diff options
Diffstat (limited to 'arch/mips/lantiq/early_printk.c')
-rw-r--r-- | arch/mips/lantiq/early_printk.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/arch/mips/lantiq/early_printk.c b/arch/mips/lantiq/early_printk.c index 972e05f87631..9b28d0940ef4 100644 --- a/arch/mips/lantiq/early_printk.c +++ b/arch/mips/lantiq/early_printk.c | |||
@@ -6,17 +6,16 @@ | |||
6 | * Copyright (C) 2010 John Crispin <blogic@openwrt.org> | 6 | * Copyright (C) 2010 John Crispin <blogic@openwrt.org> |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <linux/init.h> | ||
10 | #include <linux/cpu.h> | 9 | #include <linux/cpu.h> |
11 | |||
12 | #include <lantiq.h> | ||
13 | #include <lantiq_soc.h> | 10 | #include <lantiq_soc.h> |
14 | 11 | ||
15 | /* no ioremap possible at this early stage, lets use KSEG1 instead */ | ||
16 | #define LTQ_ASC_BASE KSEG1ADDR(LTQ_ASC1_BASE_ADDR) | ||
17 | #define ASC_BUF 1024 | 12 | #define ASC_BUF 1024 |
18 | #define LTQ_ASC_FSTAT ((u32 *)(LTQ_ASC_BASE + 0x0048)) | 13 | #define LTQ_ASC_FSTAT ((u32 *)(LTQ_EARLY_ASC + 0x0048)) |
19 | #define LTQ_ASC_TBUF ((u32 *)(LTQ_ASC_BASE + 0x0020)) | 14 | #ifdef __BIG_ENDIAN |
15 | #define LTQ_ASC_TBUF ((u32 *)(LTQ_EARLY_ASC + 0x0020 + 3)) | ||
16 | #else | ||
17 | #define LTQ_ASC_TBUF ((u32 *)(LTQ_EARLY_ASC + 0x0020)) | ||
18 | #endif | ||
20 | #define TXMASK 0x3F00 | 19 | #define TXMASK 0x3F00 |
21 | #define TXOFFSET 8 | 20 | #define TXOFFSET 8 |
22 | 21 | ||
@@ -27,7 +26,7 @@ void prom_putchar(char c) | |||
27 | local_irq_save(flags); | 26 | local_irq_save(flags); |
28 | do { } while ((ltq_r32(LTQ_ASC_FSTAT) & TXMASK) >> TXOFFSET); | 27 | do { } while ((ltq_r32(LTQ_ASC_FSTAT) & TXMASK) >> TXOFFSET); |
29 | if (c == '\n') | 28 | if (c == '\n') |
30 | ltq_w32('\r', LTQ_ASC_TBUF); | 29 | ltq_w8('\r', LTQ_ASC_TBUF); |
31 | ltq_w32(c, LTQ_ASC_TBUF); | 30 | ltq_w8(c, LTQ_ASC_TBUF); |
32 | local_irq_restore(flags); | 31 | local_irq_restore(flags); |
33 | } | 32 | } |