diff options
| author | Milton Miller <miltonm@bga.com> | 2005-09-06 11:55:38 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-06 16:07:36 +1000 |
| commit | 37548d58e5ce53dda609c5b35c0eb62d50d59675 (patch) | |
| tree | 2cbe5b628e6120464cba4c3c6534c00a2dc72db3 | |
| parent | cb14c4d641b4e083fae7ce4a0e8a3973cecb7554 (diff) | |
| download | op-kernel-dev-37548d58e5ce53dda609c5b35c0eb62d50d59675.zip op-kernel-dev-37548d58e5ce53dda609c5b35c0eb62d50d59675.tar.gz | |
[PATCH] ppc64: Make udbg_init_uart set the ppc_md udbg methods.
make udbg_init_uart set the ppc_md udbg methods.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/ppc64/kernel/maple_setup.c | 3 | ||||
| -rw-r--r-- | arch/ppc64/kernel/pSeries_setup.c | 3 | ||||
| -rw-r--r-- | arch/ppc64/kernel/udbg.c | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/arch/ppc64/kernel/maple_setup.c b/arch/ppc64/kernel/maple_setup.c index bb55b5a..fc05674 100644 --- a/arch/ppc64/kernel/maple_setup.c +++ b/arch/ppc64/kernel/maple_setup.c @@ -207,9 +207,6 @@ static void __init maple_init_early(void) comport = (void *)ioremap(physport, 16); udbg_init_uart(comport, default_speed); - ppc_md.udbg_putc = udbg_putc; - ppc_md.udbg_getc = udbg_getc; - ppc_md.udbg_getc_poll = udbg_getc_poll; DBG("Hello World !\n"); } diff --git a/arch/ppc64/kernel/pSeries_setup.c b/arch/ppc64/kernel/pSeries_setup.c index f0f0630..cb570fd 100644 --- a/arch/ppc64/kernel/pSeries_setup.c +++ b/arch/ppc64/kernel/pSeries_setup.c @@ -397,9 +397,6 @@ static void __init pSeries_init_early(void) comport = (void *)ioremap(physport, 16); udbg_init_uart(comport, default_speed); - ppc_md.udbg_putc = udbg_putc; - ppc_md.udbg_getc = udbg_getc; - ppc_md.udbg_getc_poll = udbg_getc_poll; DBG("Hello World !\n"); } diff --git a/arch/ppc64/kernel/udbg.c b/arch/ppc64/kernel/udbg.c index 155670a..b531583 100644 --- a/arch/ppc64/kernel/udbg.c +++ b/arch/ppc64/kernel/udbg.c @@ -70,6 +70,9 @@ void udbg_init_uart(void __iomem *comport, unsigned int speed) out_8(&udbg_comport->lcr, 0x03); /* 8 data, 1 stop, no parity */ out_8(&udbg_comport->mcr, 0x03); /* RTS/DTR */ out_8(&udbg_comport->fcr ,0x07); /* Clear & enable FIFOs */ + ppc_md.udbg_putc = udbg_putc; /* set access methods */ + ppc_md.udbg_getc = udbg_getc; + ppc_md.udbg_getc_poll = udbg_getc_poll; } } |
