[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>

diff --git a/arch/ppc64/kernel/maple_setup.c b/arch/ppc64/kernel/maple_setup.c
index bb55b5a569103ca48d7932d753f41ceeb9349f11..fc0567498a3a30deeb69bb80cc897e98e5b8db40 100644 (file)
--- 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 f0f0630cf07cb0098030d92297f4e4d12b0ed74d..cb570fd23031ce7e17de714918c6a6fbc8e61787 100644 (file)
--- 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 155670a40c3b8186988b3ea7f1d39a245d9fb787..b531583b88d71589066be26cee2ccbc780d88a77 100644 (file)
--- 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;
        }
 }