diff options
| author | John Crispin <john@openwrt.org> | 2014-08-07 14:41:19 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2014-08-07 14:41:19 +0000 |
| commit | bc67bd229555f708717cd7647429f64b4c563a52 (patch) | |
| tree | 09c23e958577e32fef82db5d7c1821e3049cea17 /target/linux/ramips/patches-3.14/0015-MIPS-ralink-cleanup-early_printk.patch | |
| parent | e41a0cafff16f2443e587884782172c6d8478771 (diff) | |
| download | upstream-bc67bd229555f708717cd7647429f64b4c563a52.tar.gz upstream-bc67bd229555f708717cd7647429f64b4c563a52.tar.bz2 upstream-bc67bd229555f708717cd7647429f64b4c563a52.zip | |
ralink: add 3.14 support
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 42040
Diffstat (limited to 'target/linux/ramips/patches-3.14/0015-MIPS-ralink-cleanup-early_printk.patch')
| -rw-r--r-- | target/linux/ramips/patches-3.14/0015-MIPS-ralink-cleanup-early_printk.patch | 84 |
1 files changed, 84 insertions, 0 deletions
diff --git a/target/linux/ramips/patches-3.14/0015-MIPS-ralink-cleanup-early_printk.patch b/target/linux/ramips/patches-3.14/0015-MIPS-ralink-cleanup-early_printk.patch new file mode 100644 index 0000000000..a874c4aeb6 --- /dev/null +++ b/target/linux/ramips/patches-3.14/0015-MIPS-ralink-cleanup-early_printk.patch @@ -0,0 +1,84 @@ +From e410b0069ee7c318a5b556f39b8b16814330a208 Mon Sep 17 00:00:00 2001 +From: John Crispin <blogic@openwrt.org> +Date: Fri, 24 Jan 2014 17:01:17 +0100 +Subject: [PATCH 15/57] MIPS: ralink: cleanup early_printk + +Add support for the new MT7621/8 SoC and kill ifdefs. +Cleanup some whitespace error while we are at it. + +Signed-off-by: John Crispin <blogic@openwrt.org> +--- + arch/mips/ralink/early_printk.c | 45 ++++++++++++++++++++++++++------------- + 1 file changed, 30 insertions(+), 15 deletions(-) + +diff --git a/arch/mips/ralink/early_printk.c b/arch/mips/ralink/early_printk.c +index b46d041..255d695 100644 +--- a/arch/mips/ralink/early_printk.c ++++ b/arch/mips/ralink/early_printk.c +@@ -12,21 +12,24 @@ + #include <asm/addrspace.h> + + #ifdef CONFIG_SOC_RT288X +-#define EARLY_UART_BASE 0x300c00 ++#define EARLY_UART_BASE 0x300c00 ++#define CHIPID_BASE 0x300004 ++#elif defined(CONFIG_SOC_MT7621) ++#define EARLY_UART_BASE 0x1E000c00 ++#define CHIPID_BASE 0x1E000004 + #else +-#define EARLY_UART_BASE 0x10000c00 ++#define EARLY_UART_BASE 0x10000c00 ++#define CHIPID_BASE 0x10000004 + #endif + +-#define UART_REG_RX 0x00 +-#define UART_REG_TX 0x04 +-#define UART_REG_IER 0x08 +-#define UART_REG_IIR 0x0c +-#define UART_REG_FCR 0x10 +-#define UART_REG_LCR 0x14 +-#define UART_REG_MCR 0x18 +-#define UART_REG_LSR 0x1c ++#define MT7628_CHIP_NAME1 0x20203832 ++ ++#define UART_REG_TX 0x04 ++#define UART_REG_LSR 0x14 ++#define UART_REG_LSR_RT2880 0x1c + + static __iomem void *uart_membase = (__iomem void *) KSEG1ADDR(EARLY_UART_BASE); ++static __iomem void *chipid_membase = (__iomem void *) KSEG1ADDR(CHIPID_BASE); + + static inline void uart_w32(u32 val, unsigned reg) + { +@@ -38,11 +41,23 @@ static inline u32 uart_r32(unsigned reg) + return __raw_readl(uart_membase + reg); + } + ++static inline int soc_is_mt7628(void) ++{ ++ return IS_ENABLED(CONFIG_SOC_MT7620) && ++ (__raw_readl(chipid_membase) == MT7628_CHIP_NAME1); ++} ++ + void prom_putchar(unsigned char ch) + { +- while ((uart_r32(UART_REG_LSR) & UART_LSR_THRE) == 0) +- ; +- uart_w32(ch, UART_REG_TX); +- while ((uart_r32(UART_REG_LSR) & UART_LSR_THRE) == 0) +- ; ++ if (IS_ENABLED(CONFIG_SOC_MT7621) || soc_is_mt7628()) { ++ uart_w32(ch, UART_TX); ++ while ((uart_r32(UART_REG_LSR) & UART_LSR_THRE) == 0) ++ ; ++ } else { ++ while ((uart_r32(UART_REG_LSR_RT2880) & UART_LSR_THRE) == 0) ++ ; ++ uart_w32(ch, UART_REG_TX); ++ while ((uart_r32(UART_REG_LSR_RT2880) & UART_LSR_THRE) == 0) ++ ; ++ } + } +-- +1.7.10.4 + |