Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37548d58 authored by Milton Miller's avatar Milton Miller Committed by Paul Mackerras
Browse files

[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: default avatarMilton Miller <miltonm@bga.com>
Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent cb14c4d6

arch/ppc64/kernel/maple_setup.c

+0 −3
Original line number Diff line number Diff line
@@ -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");

	}

arch/ppc64/kernel/pSeries_setup.c

+0 −3
Original line number Diff line number Diff line
@@ -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");

	}

arch/ppc64/kernel/udbg.c

+3 −0
Original line number Diff line number Diff line
@@ -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;

	}

}