commit 84dee301c30d728f97c85f795661804980fb0c77
author Mathieu J. Poirier <mathieu.poirier@linaro.org> Fri Aug 03 11:05:12 2012 +0000
committer Albert ARIBAUD <albert.u.boot@aribaud.net> Sat Sep 01 14:58:19 2012 +0200
tree 272531d48c7393233c38f3a9b3c0fdbd6ff1d4bf
parent 77bfa6b4361e72529742ce36693a2adab66890a6

snowball: Add support for ux500 based snowball board

Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: John Rigby <john.rigby@linaro.org>
Acked-by: Tom Rini <trini@ti.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>

Conflicts:

	drivers/gpio/Makefile

drivers/serial/serial_pl01x.c

diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c
index ed581ae..d4c5137 100644
--- a/drivers/serial/serial_pl01x.c
+++ b/drivers/serial/serial_pl01x.c
@@ -156,6 +156,8 @@
 			writel(lcr, &regs->fr);
 
 		writel(lcr, &regs->pl011_rlcr);
+		/* lcrh needs to be set again for change to be effective */
+		writel(lcr, &regs->pl011_lcrh);
 	}
 #endif
 	/* Finally, enable the UART */