aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMadhukar Pappireddy <madhukar.pappireddy@arm.com>2021-06-01 16:45:49 +0200
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2021-06-01 16:45:49 +0200
commit906116f82974885494a9a151427c307dfd0e5bbd (patch)
tree8615e63504002bb6e035947528fa38aa7701c6ea
parent4fe55a2fd8b7dbd00886ff4cc57429e16b99850e (diff)
parentb9185c75f7ec2b600ebe0d49281e216a2456b764 (diff)
downloadtrusted-firmware-a-906116f82974885494a9a151427c307dfd0e5bbd.tar.gz
Merge "fix(plat/marvell/a3720/uart): fix configuring UART clock" into integration
-rw-r--r--drivers/marvell/uart/a3700_console.S7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/marvell/uart/a3700_console.S b/drivers/marvell/uart/a3700_console.S
index ad2ccf216d..218fd861ce 100644
--- a/drivers/marvell/uart/a3700_console.S
+++ b/drivers/marvell/uart/a3700_console.S
@@ -49,12 +49,9 @@ func console_a3700_core_init
lsl w2, w2, #4
add w1, w1, w2, lsr #1
udiv w2, w1, w2
- and w2, w2, #0x3ff
+ and w2, w2, #0x3ff /* clear all other bits to use default clock */
- ldr w3, [x0, #UART_BAUD_REG]
- bic w3, w3, 0x3ff
- orr w3, w3, w2
- str w3, [x0, #UART_BAUD_REG]/* set baud rate divisor */
+ str w2, [x0, #UART_BAUD_REG]/* set baud rate divisor */
/* Set UART to default 16X scheme */
mov w3, #0