From 25264e292ceb7889ce5ad9ed902016761aac024e Mon Sep 17 00:00:00 2001 From: Jagdish Gediya Date: Fri, 28 Jun 2024 11:00:18 +0000 Subject: [PATCH 1/2] refactor(tc): remove redundant macro UARTCLK_FREQ remove redundant macro UARTCLK_FREQ and replace it with TC_UARTCLK in dts. Change-Id: Id463a9ddc1588278e552ffca3dfb738676229ce7 Signed-off-by: Jagdish Gediya Signed-off-by: Icen.Zeyada --- fdts/tc-base.dtsi | 2 +- fdts/tc2.dts | 1 - fdts/tc3-4-base.dtsi | 1 - plat/arm/board/tc/include/platform_def.h | 10 +++++----- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/fdts/tc-base.dtsi b/fdts/tc-base.dtsi index e898399b9..691a3b8c0 100644 --- a/fdts/tc-base.dtsi +++ b/fdts/tc-base.dtsi @@ -387,7 +387,7 @@ soc_uartclk: uartclk { compatible = "fixed-clock"; #clock-cells = <0>; - clock-frequency = ; + clock-frequency = ; clock-output-names = "uartclk"; }; diff --git a/fdts/tc2.dts b/fdts/tc2.dts index c49227493..003efdc90 100644 --- a/fdts/tc2.dts +++ b/fdts/tc2.dts @@ -36,7 +36,6 @@ #define BIG_CPU_PMU_COMPATIBLE "arm,cortex-x4-pmu" #define MPAM_ADDR 0x1 0x00010000 /* 0x1_0001_0000 */ -#define UARTCLK_FREQ 5000000 #define DPU_ADDR 2cc00000 #define DPU_IRQ 69 diff --git a/fdts/tc3-4-base.dtsi b/fdts/tc3-4-base.dtsi index c7f3084ba..84aa8e85c 100644 --- a/fdts/tc3-4-base.dtsi +++ b/fdts/tc3-4-base.dtsi @@ -18,7 +18,6 @@ #define MHU_RX_INT_NAME "combined" #define MPAM_ADDR 0x0 0x5f010000 /* 0x5f01_0000 */ -#define UARTCLK_FREQ 3750000 #if TARGET_FLAVOUR_FVP #define DPU_ADDR 4000000000 diff --git a/plat/arm/board/tc/include/platform_def.h b/plat/arm/board/tc/include/platform_def.h index 5a226284c..e3150d69f 100644 --- a/plat/arm/board/tc/include/platform_def.h +++ b/plat/arm/board/tc/include/platform_def.h @@ -443,16 +443,16 @@ #undef PLAT_ARM_BOOT_UART_CLK_IN_HZ #undef PLAT_ARM_RUN_UART_CLK_IN_HZ -#if TARGET_FLAVOUR_FVP -#define PLAT_ARM_BOOT_UART_BASE TC_UART1 -#define TC_UARTCLK 7372800 -#else /* TARGET_FLAVOUR_FPGA */ -#define PLAT_ARM_BOOT_UART_BASE TC_UART0 #if TARGET_PLATFORM <= 2 #define TC_UARTCLK 5000000 #elif TARGET_PLATFORM >= 3 #define TC_UARTCLK 3750000 #endif /* TARGET_PLATFORM >= 3 */ + +#if TARGET_FLAVOUR_FVP +#define PLAT_ARM_BOOT_UART_BASE TC_UART1 +#else /* TARGET_FLAVOUR_FPGA */ +#define PLAT_ARM_BOOT_UART_BASE TC_UART0 #undef ARM_CONSOLE_BAUDRATE #define ARM_CONSOLE_BAUDRATE 38400 #endif /* TARGET_FLAVOUR_FPGA */ From 54289385f128e5ddad8d2f1be0d63a9edf685922 Mon Sep 17 00:00:00 2001 From: Jagdish Gediya Date: Tue, 13 Aug 2024 13:50:56 +0000 Subject: [PATCH 2/2] fix(tc): set console baurate to 38400 for fvp as well Set console baurate to 38400 for fvp as well for code simplicity. Change-Id: I58ba6b7043541f6eb67e32257307da4eba0bb28a Signed-off-by: Jagdish Gediya Signed-off-by: Icen.Zeyada --- plat/arm/board/tc/include/platform_def.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plat/arm/board/tc/include/platform_def.h b/plat/arm/board/tc/include/platform_def.h index e3150d69f..ff7940244 100644 --- a/plat/arm/board/tc/include/platform_def.h +++ b/plat/arm/board/tc/include/platform_def.h @@ -443,6 +443,9 @@ #undef PLAT_ARM_BOOT_UART_CLK_IN_HZ #undef PLAT_ARM_RUN_UART_CLK_IN_HZ +#undef ARM_CONSOLE_BAUDRATE +#define ARM_CONSOLE_BAUDRATE 38400 + #if TARGET_PLATFORM <= 2 #define TC_UARTCLK 5000000 #elif TARGET_PLATFORM >= 3 @@ -453,8 +456,6 @@ #define PLAT_ARM_BOOT_UART_BASE TC_UART1 #else /* TARGET_FLAVOUR_FPGA */ #define PLAT_ARM_BOOT_UART_BASE TC_UART0 -#undef ARM_CONSOLE_BAUDRATE -#define ARM_CONSOLE_BAUDRATE 38400 #endif /* TARGET_FLAVOUR_FPGA */ #define PLAT_ARM_RUN_UART_BASE TC_UART0