target/linux/ramips/patches-4.3/0003-MIPS-ralink-cleanup-early_printk.patch

   1 From 4d805af8246efdc330d6af9a8bd10ce892327598 Mon Sep 17 00:00:00 2001
   2 From: John Crispin <blogic@openwrt.org>
   3 Date: Fri, 24 Jan 2014 17:01:17 +0100
   4 Subject: [PATCH 03/53] MIPS: ralink: cleanup early_printk
   5
   6 Add support for the new MT7621/8 SoC and kill ifdefs.
   7 Cleanup some whitespace error while we are at it.
   8
   9 Signed-off-by: John Crispin <blogic@openwrt.org>
  10 ---
  11  arch/mips/ralink/early_printk.c |   25 +++++++++++++++++++++++++
  12  1 file changed, 25 insertions(+)
  13
  14 diff --git a/arch/mips/ralink/early_printk.c b/arch/mips/ralink/early_printk.c
  15 index 255d695..c04ee53 100644
  16 --- a/arch/mips/ralink/early_printk.c
  17 +++ b/arch/mips/ralink/early_printk.c
  18 @@ -25,11 +25,13 @@
  19  #define MT7628_CHIP_NAME1      0x20203832
  20
  21  #define UART_REG_TX            0x04
  22 +#define UART_REG_LCR           0x0c
  23  #define UART_REG_LSR           0x14
  24  #define UART_REG_LSR_RT2880    0x1c
  25
  26  static __iomem void *uart_membase = (__iomem void *) KSEG1ADDR(EARLY_UART_BASE);
  27  static __iomem void *chipid_membase = (__iomem void *) KSEG1ADDR(CHIPID_BASE);
  28 +static int init_complete;
  29
  30  static inline void uart_w32(u32 val, unsigned reg)
  31  {
  32 @@ -47,8 +49,31 @@ static inline int soc_is_mt7628(void)
  33                 (__raw_readl(chipid_membase) == MT7628_CHIP_NAME1);
  34  }
  35
  36 +static inline void find_uart_base(void)
  37 +{
  38 +       int i;
  39 +
  40 +       if (!soc_is_mt7628())
  41 +               return;
  42 +
  43 +       for (i = 0; i < 3; i++) {
  44 +               u32 reg = uart_r32(UART_REG_LCR + (0x100 * i));
  45 +
  46 +               if (!reg)
  47 +                       continue;
  48 +
  49 +               uart_membase = (__iomem void *) KSEG1ADDR(EARLY_UART_BASE + (0x100 * i));
  50 +               break;
  51 +       }
  52 +}
  53 +
  54  void prom_putchar(unsigned char ch)
  55  {
  56 +       if (!init_complete) {
  57 +               find_uart_base();
  58 +               init_complete = 1;
  59 +       }
  60 +
  61         if (IS_ENABLED(CONFIG_SOC_MT7621) || soc_is_mt7628()) {
  62                 uart_w32(ch, UART_TX);
  63                 while ((uart_r32(UART_REG_LSR) & UART_LSR_THRE) == 0)
  64 --
  65 1.7.10.4
  66