android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc/wsp: Fix early debug build

Browse Source 
When reworking udbg_16550.c I forgot to remove the old and now useless
code for the CONFIG_PPC_EARLY_DEBUG_WSP case, which doesn't build as
a result. I also missed a cast.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Benjamin Herrenschmidt
2013-08-16 10:13:06 +10:00
parent 54bb7f4bda
commit afbcdd97bf
1 changed files with 1 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
arch/powerpc/kernel/udbg_16550.c
View File

@ -300,45 +300,9 @@ void __init udbg_init_40x_realmode(void)
#ifdef CONFIG_PPC_EARLY_DEBUG_WSP #ifdef CONFIG_PPC_EARLY_DEBUG_WSP
static void udbg_wsp_flush(void)
{
if (udbg_comport) {
while ((readb(&udbg_comport->lsr) & LSR_THRE) == 0)
/* wait for idle */;
}
}
static void udbg_wsp_putc(char c)
{
if (udbg_comport) {
if (c == '\n')
udbg_wsp_putc('\r');
udbg_wsp_flush();
writeb(c, &udbg_comport->thr); eieio();
}
}
static int udbg_wsp_getc(void)
{
if (udbg_comport) {
while ((readb(&udbg_comport->lsr) & LSR_DR) == 0)
; /* wait for char */
return readb(&udbg_comport->rbr);
}
return -1;
}
static int udbg_wsp_getc_poll(void)
{
if (udbg_comport)
if (readb(&udbg_comport->lsr) & LSR_DR)
return readb(&udbg_comport->rbr);
return -1;
}
void __init udbg_init_wsp(void) void __init udbg_init_wsp(void)
{ {
udbg_uart_init_mmio(WSP_UART_VIRT, 1); udbg_uart_init_mmio((void *)WSP_UART_VIRT, 1);
udbg_uart_setup(57600, 50000000); udbg_uart_setup(57600, 50000000);
} }