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

Commit 49db76eb authored by Philipp Zabel's avatar Philipp Zabel Committed by Russell King
Browse files

[ARM] 4663/1: Only putc uncompressor output into FFUART if it was enabled by the bootloader 



Also, use existing register and bit definitions instead of numbers.

Signed-off-by: default avatarPhilipp Zabel <philipp.zabel@gmail.com>
Acked-by: default avatarNicolas Pitre <nico@cam.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 6bc54e69

include/asm-arm/arch-pxa/uncompress.h

+7 −2
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ 
 * published by the Free Software Foundation.

 */



#include <linux/serial_reg.h>

#include <asm/arch/pxa-regs.h>



#define FFUART		((volatile unsigned long *)0x40100000)

#define BTUART		((volatile unsigned long *)0x40200000)

#define STUART		((volatile unsigned long *)0x40700000)
@@ -19,9 +22,11 @@ 


static inline void putc(char c)

{

	while (!(UART[5] & 0x20))

	if (!(UART[UART_IER] & IER_UUE))

		return;

	while (!(UART[UART_LSR] & LSR_TDRQ))

		barrier();

	UART[0] = c;

	UART[UART_TX] = c;

}



/*