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

Commit be6b8439 authored by Kumar Gala's avatar Kumar Gala Committed by Paul Mackerras
Browse files

[PATCH] powerpc: added a udbg_progress 



Added a common udbg_progress for use by ppc_md.progress()

Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent b580d46c

arch/powerpc/kernel/udbg.c

+6 −0
Original line number Diff line number Diff line
@@ -90,6 +90,12 @@ void udbg_printf(const char *fmt, ...) 
	va_end(args);

}



void __init udbg_progress(char *s, unsigned short hex)

{

	udbg_puts(s);

	udbg_puts("\n");

}



/*

 * Early boot console based on udbg

 */

arch/powerpc/platforms/powermac/setup.c

+1 −7
Original line number Diff line number Diff line
@@ -639,12 +639,6 @@ static void __init pmac_init_early(void) 
#endif

}



static void __init pmac_progress(char *s, unsigned short hex)

{

	udbg_puts(s);

	udbg_puts("\n");

}



/*

 * pmac has no legacy IO, anything calling this function has to

 * fail or bad things will happen
@@ -763,7 +757,7 @@ struct machdep_calls __initdata pmac_md = { 
	.calibrate_decr		= pmac_calibrate_decr,

	.feature_call		= pmac_do_feature_call,

	.check_legacy_ioport	= pmac_check_legacy_ioport,

	.progress		= pmac_progress,

	.progress		= udbg_progress,

#ifdef CONFIG_PPC64

	.pci_probe_mode		= pmac_pci_probe_mode,

	.idle_loop		= native_idle,

include/asm-powerpc/udbg.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ extern int udbg_read(char *buf, int buflen); 


extern void register_early_udbg_console(void);

extern void udbg_printf(const char *fmt, ...);

extern void udbg_progress(char *s, unsigned short hex);



extern void udbg_init_uart(void __iomem *comport, unsigned int speed,

			   unsigned int clock);