Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
arch
/
mips
/
ath79
/
early_printk.c
diff --git
a/kernel/arch/mips/ath79/early_printk.c
b/kernel/arch/mips/ath79/early_printk.c
index
b955faf
..
d1adc59
100644
(file)
--- a/
kernel/arch/mips/ath79/early_printk.c
+++ b/
kernel/arch/mips/ath79/early_printk.c
@@
-31,13
+31,15
@@
static inline void prom_putchar_wait(void __iomem *reg, u32 mask, u32 val)
} while (1);
}
} while (1);
}
+#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
+
static void prom_putchar_ar71xx(unsigned char ch)
{
void __iomem *base = (void __iomem *)(KSEG1ADDR(AR71XX_UART_BASE));
static void prom_putchar_ar71xx(unsigned char ch)
{
void __iomem *base = (void __iomem *)(KSEG1ADDR(AR71XX_UART_BASE));
- prom_putchar_wait(base + UART_LSR * 4,
UART_LSR_THRE, UART_LSR_THRE
);
+ prom_putchar_wait(base + UART_LSR * 4,
BOTH_EMPTY, BOTH_EMPTY
);
__raw_writel(ch, base + UART_TX * 4);
__raw_writel(ch, base + UART_TX * 4);
- prom_putchar_wait(base + UART_LSR * 4,
UART_LSR_THRE, UART_LSR_THRE
);
+ prom_putchar_wait(base + UART_LSR * 4,
BOTH_EMPTY, BOTH_EMPTY
);
}
static void prom_putchar_ar933x(unsigned char ch)
}
static void prom_putchar_ar933x(unsigned char ch)