Signed-off-by: Sergey Ryazanov <ryazanov.s.a@xxxxxxxxx> --- arch/mips/Kconfig | 1 + arch/mips/ar231x/Makefile | 2 ++ arch/mips/ar231x/early_printk.c | 45 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 arch/mips/ar231x/early_printk.c diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index bd81f7a..b89bfdf 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -83,6 +83,7 @@ config AR231X select SYS_SUPPORTS_BIG_ENDIAN select SYS_SUPPORTS_32BIT_KERNEL select ARCH_REQUIRE_GPIOLIB + select SYS_HAS_EARLY_PRINTK help Support for Atheros AR231x and Atheros AR531x based boards diff --git a/arch/mips/ar231x/Makefile b/arch/mips/ar231x/Makefile index 201b7d4..eabad7d 100644 --- a/arch/mips/ar231x/Makefile +++ b/arch/mips/ar231x/Makefile @@ -10,5 +10,7 @@ obj-y += board.o prom.o devices.o +obj-$(CONFIG_EARLY_PRINTK) += early_printk.o + obj-$(CONFIG_SOC_AR5312) += ar5312.o obj-$(CONFIG_SOC_AR2315) += ar2315.o diff --git a/arch/mips/ar231x/early_printk.c b/arch/mips/ar231x/early_printk.c new file mode 100644 index 0000000..393c5ab --- /dev/null +++ b/arch/mips/ar231x/early_printk.c @@ -0,0 +1,45 @@ +/* + * 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@xxxxxxxxxxx> + */ + +#include <linux/mm.h> +#include <linux/io.h> +#include <linux/serial_reg.h> + +#include <ar2315_regs.h> +#include <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) + ; +} + -- 1.8.5.5