summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-uniphier/include/mach
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2015-05-29 17:30:02 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2015-05-31 02:55:34 +0900
commit12a70e3c9616b4890421d3035e2dfa68b152289b (patch)
tree832552e1809a7a8e5b1e47ab33dbd2160374e67d /arch/arm/mach-uniphier/include/mach
parentb6ef3a3f04b96336f1f4b519d62c12aad1f9f7b8 (diff)
downloadtalos-obmc-uboot-12a70e3c9616b4890421d3035e2dfa68b152289b.tar.gz
talos-obmc-uboot-12a70e3c9616b4890421d3035e2dfa68b152289b.zip
ARM: UniPhier: use 32 bit register access for debug UART setting
For the same reason as commit d0c47b3ef7c5 (serial: UniPhier: use 32 bit register access), use "str" instead of "strb" for the LCR register setting. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/arm/mach-uniphier/include/mach')
-rw-r--r--arch/arm/mach-uniphier/include/mach/debug-uart.S7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-uniphier/include/mach/debug-uart.S b/arch/arm/mach-uniphier/include/mach/debug-uart.S
index af55feed04..d2b431f544 100644
--- a/arch/arm/mach-uniphier/include/mach/debug-uart.S
+++ b/arch/arm/mach-uniphier/include/mach/debug-uart.S
@@ -1,6 +1,5 @@
/*
- * Copyright (C) 2014 Panasonic Corporation
- * Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ * Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
*
* SPDX-License-Identifier: GPL-2.0+
*/
@@ -17,8 +16,8 @@
.macro init_debug_uart, ra, rb, rc
addruart \ra, \rb, \rc
- mov \rb, #UART_LCR_WLEN8
- strb \rb, [\ra, #0x11]
+ mov \rb, #UART_LCR_WLEN8 << 8
+ str \rb, [\ra, #0x10]
ldr \rb, =DIVISOR
str \rb, [\ra, #0x24]
.endm
OpenPOWER on IntegriCloud