Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-05-01 16:13:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "fix(plat/marvell/a3720/uart): fix UART clock rate value and divisor calculation" into integration

Browse source
This commit is contained in:
Madhukar Pappireddy 2021-06-01 16:13:11 +02:00 • committed by TrustedFirmware Code Review
commit 4fe55a2fd8
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/marvell/uart/a3700_console.S
View file

@ -45,8 +45,9 @@ func console_a3700_core_init
cbz w2, init_fail cbz w2, init_fail
/* Program the baudrate */ /* Program the baudrate */
/* Divisor = Uart clock / (16 * baudrate) */ /* Divisor = Round(Uartclock / (16 * baudrate)) */
lsl w2, w2, #4 lsl w2, w2, #4
add w1, w1, w2, lsr #1
udiv w2, w1, w2 udiv w2, w1, w2
and w2, w2, #0x3ff and w2, w2, #0x3ff

2
plat/marvell/armada/a3k/common/include/platform_def.h
View file

@ -164,7 +164,7 @@
* PL011 related constants * PL011 related constants
*/ */
#define PLAT_MARVELL_BOOT_UART_BASE (MVEBU_REGS_BASE + 0x12000) #define PLAT_MARVELL_BOOT_UART_BASE (MVEBU_REGS_BASE + 0x12000)
#define PLAT_MARVELL_BOOT_UART_CLK_IN_HZ 25804800 #define PLAT_MARVELL_BOOT_UART_CLK_IN_HZ 25000000
#define PLAT_MARVELL_CRASH_UART_BASE PLAT_MARVELL_BOOT_UART_BASE #define PLAT_MARVELL_CRASH_UART_BASE PLAT_MARVELL_BOOT_UART_BASE
#define PLAT_MARVELL_CRASH_UART_CLK_IN_HZ PLAT_MARVELL_BOOT_UART_CLK_IN_HZ #define PLAT_MARVELL_CRASH_UART_CLK_IN_HZ PLAT_MARVELL_BOOT_UART_CLK_IN_HZ