From: Masahiro Yamada Date: Fri, 29 May 2015 08:30:02 +0000 (+0900) Subject: ARM: UniPhier: use 32 bit register access for debug UART setting X-Git-Tag: v2015.07-rc2~49^2~8 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=12a70e3c9616b4890421d3035e2dfa68b152289b;p=oweals%2Fu-boot.git 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 --- 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 + * Copyright (C) 2014-2015 Masahiro Yamada * * 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