[Xen-changelog] [xen-unstable] xen: arm: Correct register values and comment in early init_uart.

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Lars Rasmusson <Lars.Rasmusson@xxxxxxx>
# Date 1358441302 0
# Node ID afe9bed5e25bd02daf7adcdd31777bb54f0ee567
# Parent  e490bf88e0d856ca9281bd131d0972a463b32b68
xen: arm: Correct register values and comment in early init_uart.

Set register values and comment in early init_uart to match
documentation of PL011 UART

Reading the PL011 UART documentation on
http://infocenter.arm.com/help/topic/com.arm.doc.ddi0183f/DDI0183.pdf
in sec 3.2 shows the early initialisation of the UART on the Versatile Express
is incorrect.  This fixes it.

Signed-off-by: Lars Rasmusson <Lars.Rasmusson@xxxxxxx>
Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Committed-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---


diff -r e490bf88e0d8 -r afe9bed5e25b xen/arch/arm/arm32/head.S
--- a/xen/arch/arm/arm32/head.S Thu Jan 17 16:48:21 2013 +0000
+++ b/xen/arch/arm/arm32/head.S Thu Jan 17 16:48:22 2013 +0000
@@ -352,11 +352,11 @@ 1:      wfe
  * Clobbers r0-r2 */
 init_uart:
         mov   r1, #0x0
-        str   r1, [r11, #0x24]       /* -> UARTIBRD (Baud divisor fraction) */
+        str   r1, [r11, #0x28]       /* -> UARTFBRD (Baud divisor fraction) */
         mov   r1, #0x4               /* 7.3728MHz / 0x4 == 16 * 115200 */
         str   r1, [r11, #0x24]       /* -> UARTIBRD (Baud divisor integer) */
         mov   r1, #0x60              /* 8n1 */
-        str   r1, [r11, #0x24]       /* -> UARTLCR_H (Line control) */
+        str   r1, [r11, #0x2C]       /* -> UARTLCR_H (Line control) */
         ldr   r1, =0x00000301        /* RXE | TXE | UARTEN */
         str   r1, [r11, #0x30]       /* -> UARTCR (Control Register) */
         adr   r0, 1f

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog