diff options
| author | Hollis Blanchard <hollisb@us.ibm.com> | 2007-09-17 05:56:47 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@gmail.com> | 2007-09-19 21:13:17 -0500 |
| commit | 70dea47da12932cc512e09124a836ddd3499ab39 (patch) | |
| tree | 1ed340a26a225254c53c209ab4b86833b403b0a6 | |
| parent | 504ca43e5e681b8ed3837f11ea458eb145a82e4e (diff) | |
| download | linux-70dea47da12932cc512e09124a836ddd3499ab39.tar.bz2 | |
[POWERPC] 4xx: Implement udbg_getc() for 440
Implement udbg_getc() for 440, which fixes xmon input.
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
| -rw-r--r-- | arch/powerpc/kernel/udbg_16550.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/udbg_16550.c b/arch/powerpc/kernel/udbg_16550.c index 7afab5bcd61a..833a3d0bcfa7 100644 --- a/arch/powerpc/kernel/udbg_16550.c +++ b/arch/powerpc/kernel/udbg_16550.c @@ -206,11 +206,22 @@ static void udbg_44x_as1_putc(char c) } } +static int udbg_44x_as1_getc(void) +{ + if (udbg_comport) { + while ((as1_readb(&udbg_comport->lsr) & LSR_DR) == 0) + ; /* wait for char */ + return as1_readb(&udbg_comport->rbr); + } + return -1; +} + void __init udbg_init_44x_as1(void) { udbg_comport = (volatile struct NS16550 __iomem *)PPC44x_EARLY_DEBUG_VIRTADDR; udbg_putc = udbg_44x_as1_putc; + udbg_getc = udbg_44x_as1_getc; } #endif /* CONFIG_PPC_EARLY_DEBUG_44x */ |