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

Commit d5b1598c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'ep93xx-fixes-for-3.9-rc5' of git://github.com/RyanMallon/linux-ep93xx into fixes 

From Ryan Mallon <rmallon@gmail.com>:

It is a regression fix for some ep93xx boards which are failing to boot
on current mainline. The patch has been tested in next over the last
few days.

* tag 'ep93xx-fixes-for-3.9-rc5' of git://github.com/RyanMallon/linux-ep93xx

:
  ARM: ep93xx: Fix wait for UART FIFO to be empty

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents fb5d932a 605c357b

arch/arm/mach-ep93xx/include/mach/uncompress.h

+7 −3
Original line number Diff line number Diff line
@@ -47,9 +47,13 @@ static void __raw_writel(unsigned int value, unsigned int ptr) 


static inline void putc(int c)

{

	int i;



	for (i = 0; i < 10000; i++) {

		/* Transmit fifo not full? */

	while (__raw_readb(PHYS_UART_FLAG) & UART_FLAG_TXFF)

		;

		if (!(__raw_readb(PHYS_UART_FLAG) & UART_FLAG_TXFF))

			break;

	}



	__raw_writeb(c, PHYS_UART_DATA);

}