diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-08-04 20:54:49 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-08-04 20:54:49 +0000 |
commit | 5b9d4fd80a2b8a493c3494269f382ca79a12c126 (patch) | |
tree | 2041996473da887b574786b03686bf997cc62b79 /target/linux/atheros/patches-3.14/101-early-printk-support.patch | |
parent | 005f8ed56316490be357d119fadf0d2183fce31a (diff) | |
download | upstream-5b9d4fd80a2b8a493c3494269f382ca79a12c126.tar.gz upstream-5b9d4fd80a2b8a493c3494269f382ca79a12c126.tar.bz2 upstream-5b9d4fd80a2b8a493c3494269f382ca79a12c126.zip |
atheros: copy 3.10 patches to 3.14 and refresh them
Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
SVN-Revision: 41995
Diffstat (limited to 'target/linux/atheros/patches-3.14/101-early-printk-support.patch')
-rw-r--r-- | target/linux/atheros/patches-3.14/101-early-printk-support.patch | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/target/linux/atheros/patches-3.14/101-early-printk-support.patch b/target/linux/atheros/patches-3.14/101-early-printk-support.patch new file mode 100644 index 0000000000..d33c3f1944 --- /dev/null +++ b/target/linux/atheros/patches-3.14/101-early-printk-support.patch @@ -0,0 +1,70 @@ +--- /dev/null ++++ b/arch/mips/ar231x/early_printk.c +@@ -0,0 +1,46 @@ ++/* ++ * This file is subject to the terms and conditions of the GNU General Public ++ * License. See the file "COPYING" in the main directory of this archive ++ * for more details. ++ * ++ * Copyright (C) 2010 Gabor Juhos <juhosg@openwrt.org> ++ */ ++ ++#include <linux/mm.h> ++#include <linux/io.h> ++#include <linux/serial_reg.h> ++#include <asm/addrspace.h> ++ ++#include <asm/mach-ar231x/ar2315_regs.h> ++#include <asm/mach-ar231x/ar5312_regs.h> ++#include "devices.h" ++ ++static inline void prom_uart_wr(void __iomem *base, unsigned reg, ++ unsigned char ch) ++{ ++ __raw_writel(ch, base + 4 * reg); ++} ++ ++static inline unsigned char prom_uart_rr(void __iomem *base, unsigned reg) ++{ ++ return __raw_readl(base + 4 * reg); ++} ++ ++void prom_putchar(unsigned char ch) ++{ ++ static void __iomem *base; ++ ++ if (unlikely(base == NULL)) { ++ if (is_2315()) ++ base = (void __iomem *)(KSEG1ADDR(AR2315_UART0)); ++ else ++ base = (void __iomem *)(KSEG1ADDR(AR5312_UART0)); ++ } ++ ++ while ((prom_uart_rr(base, UART_LSR) & UART_LSR_THRE) == 0) ++ ; ++ prom_uart_wr(base, UART_TX, ch); ++ while ((prom_uart_rr(base, UART_LSR) & UART_LSR_THRE) == 0) ++ ; ++} ++ +--- a/arch/mips/ar231x/Makefile ++++ b/arch/mips/ar231x/Makefile +@@ -9,5 +9,8 @@ + # + + obj-y += board.o prom.o devices.o ++ ++obj-$(CONFIG_EARLY_PRINTK) += early_printk.o ++ + obj-$(CONFIG_ATHEROS_AR5312) += ar5312.o + obj-$(CONFIG_ATHEROS_AR2315) += ar2315.o +--- a/arch/mips/Kconfig ++++ b/arch/mips/Kconfig +@@ -154,6 +154,7 @@ config ATHEROS_AR231X + select SYS_SUPPORTS_BIG_ENDIAN + select SYS_SUPPORTS_32BIT_KERNEL + select ARCH_REQUIRE_GPIOLIB ++ select SYS_HAS_EARLY_PRINTK + help + Support for AR231x and AR531x based boards + |