mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 01:11:14 +00:00
123 lines
4.7 KiB
Diff
123 lines
4.7 KiB
Diff
|
From 3133625859b74df42deddd80b705578af6fc2fea Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org>
|
||
|
|
Date: Fri, 14 May 2021 13:21:56 +0200
|
||
|
|
Subject: [PATCH] refactor(plat/marvell/uart): de-duplicate PLAT_MARVELL_UART
|
||
|
|
macros
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Macros PLAT_MARVELL_BOOT_UART* and PLAT_MARVELL_CRASH_UART* are defined
|
||
|
|
to same values. De-duplicate them into PLAT_MARVELL_UART* macros.
|
||
|
|
|
||
|
|
Signed-off-by: Pali Rohár <pali@kernel.org>
|
||
|
|
Change-Id: Iae5daf7cad6a971e6f3dbe561df3d0174106ca7f
|
||
|
|
---
|
||
|
|
plat/marvell/armada/a3k/common/include/platform_def.h | 7 ++-----
|
||
|
|
plat/marvell/armada/a8k/a80x0_puzzle/board/system_power.c | 4 ++--
|
||
|
|
plat/marvell/armada/a8k/common/include/platform_def.h | 7 ++-----
|
||
|
|
plat/marvell/armada/common/aarch64/marvell_helpers.S | 8 ++++----
|
||
|
|
plat/marvell/armada/common/marvell_console.c | 8 ++++----
|
||
|
|
5 files changed, 14 insertions(+), 20 deletions(-)
|
||
|
|
|
||
|
|
--- a/plat/marvell/armada/a3k/common/include/platform_def.h
|
||
|
|
+++ b/plat/marvell/armada/a3k/common/include/platform_def.h
|
||
|
|
@@ -163,11 +163,8 @@
|
||
|
|
/*
|
||
|
|
* PL011 related constants
|
||
|
|
*/
|
||
|
|
-#define PLAT_MARVELL_BOOT_UART_BASE (MVEBU_REGS_BASE + 0x12000)
|
||
|
|
-#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_CLK_IN_HZ PLAT_MARVELL_BOOT_UART_CLK_IN_HZ
|
||
|
|
+#define PLAT_MARVELL_UART_BASE (MVEBU_REGS_BASE + 0x12000)
|
||
|
|
+#define PLAT_MARVELL_UART_CLK_IN_HZ 25000000
|
||
|
|
|
||
|
|
#define PLAT_MARVELL_BL31_RUN_UART_BASE PLAT_MARVELL_BOOT_UART_BASE
|
||
|
|
#define PLAT_MARVELL_BL31_RUN_UART_CLK_IN_HZ PLAT_MARVELL_BOOT_UART_CLK_IN_HZ
|
||
|
|
--- a/plat/marvell/armada/a8k/a80x0_puzzle/board/system_power.c
|
||
|
|
+++ b/plat/marvell/armada/a8k/a80x0_puzzle/board/system_power.c
|
||
|
|
@@ -41,8 +41,8 @@ int system_power_off(void)
|
||
|
|
len = sizeof(system_off_now);
|
||
|
|
system_off_now[len - 1] = add_xor_checksum(system_off_now, len);
|
||
|
|
|
||
|
|
- console_16550_register(PLAT_MARVELL_BOOT_UART_BASE + 0x100,
|
||
|
|
- PLAT_MARVELL_BOOT_UART_CLK_IN_HZ, 115200, &console);
|
||
|
|
+ console_16550_register(PLAT_MARVELL_UART_BASE + 0x100,
|
||
|
|
+ PLAT_MARVELL_UART_CLK_IN_HZ, 115200, &console);
|
||
|
|
|
||
|
|
/* Send system_off_now to console */
|
||
|
|
for (i = 0; i < len; i++) {
|
||
|
|
--- a/plat/marvell/armada/a8k/common/include/platform_def.h
|
||
|
|
+++ b/plat/marvell/armada/a8k/common/include/platform_def.h
|
||
|
|
@@ -168,11 +168,8 @@
|
||
|
|
/*
|
||
|
|
* PL011 related constants
|
||
|
|
*/
|
||
|
|
-#define PLAT_MARVELL_BOOT_UART_BASE (MVEBU_REGS_BASE + 0x512000)
|
||
|
|
-#define PLAT_MARVELL_BOOT_UART_CLK_IN_HZ 200000000
|
||
|
|
-
|
||
|
|
-#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_UART_BASE (MVEBU_REGS_BASE + 0x512000)
|
||
|
|
+#define PLAT_MARVELL_UART_CLK_IN_HZ 200000000
|
||
|
|
|
||
|
|
#define PLAT_MARVELL_BL31_RUN_UART_BASE PLAT_MARVELL_BOOT_UART_BASE
|
||
|
|
#define PLAT_MARVELL_BL31_RUN_UART_CLK_IN_HZ PLAT_MARVELL_BOOT_UART_CLK_IN_HZ
|
||
|
|
--- a/plat/marvell/armada/common/aarch64/marvell_helpers.S
|
||
|
|
+++ b/plat/marvell/armada/common/aarch64/marvell_helpers.S
|
||
|
|
@@ -63,8 +63,8 @@ endfunc plat_marvell_calc_core_pos
|
||
|
|
* ---------------------------------------------
|
||
|
|
*/
|
||
|
|
func plat_crash_console_init
|
||
|
|
- mov_imm x0, PLAT_MARVELL_CRASH_UART_BASE
|
||
|
|
- mov_imm x1, PLAT_MARVELL_CRASH_UART_CLK_IN_HZ
|
||
|
|
+ mov_imm x0, PLAT_MARVELL_UART_BASE
|
||
|
|
+ mov_imm x1, PLAT_MARVELL_UART_CLK_IN_HZ
|
||
|
|
mov_imm x2, MARVELL_CONSOLE_BAUDRATE
|
||
|
|
#ifdef PLAT_a3700
|
||
|
|
b console_a3700_core_init
|
||
|
|
@@ -81,7 +81,7 @@ endfunc plat_crash_console_init
|
||
|
|
* ---------------------------------------------
|
||
|
|
*/
|
||
|
|
func plat_crash_console_putc
|
||
|
|
- mov_imm x1, PLAT_MARVELL_CRASH_UART_BASE
|
||
|
|
+ mov_imm x1, PLAT_MARVELL_UART_BASE
|
||
|
|
#ifdef PLAT_a3700
|
||
|
|
|
||
|
|
b console_a3700_core_putc
|
||
|
|
@@ -99,7 +99,7 @@ endfunc plat_crash_console_putc
|
||
|
|
* ---------------------------------------------
|
||
|
|
*/
|
||
|
|
func plat_crash_console_flush
|
||
|
|
- mov_imm x0, PLAT_MARVELL_CRASH_UART_BASE
|
||
|
|
+ mov_imm x0, PLAT_MARVELL_UART_BASE
|
||
|
|
#ifdef PLAT_a3700
|
||
|
|
b console_a3700_core_flush
|
||
|
|
#else
|
||
|
|
--- a/plat/marvell/armada/common/marvell_console.c
|
||
|
|
+++ b/plat/marvell/armada/common/marvell_console.c
|
||
|
|
@@ -31,8 +31,8 @@ static console_t marvell_runtime_console
|
||
|
|
void marvell_console_boot_init(void)
|
||
|
|
{
|
||
|
|
int rc =
|
||
|
|
- console_marvell_register(PLAT_MARVELL_BOOT_UART_BASE,
|
||
|
|
- PLAT_MARVELL_BOOT_UART_CLK_IN_HZ,
|
||
|
|
+ console_marvell_register(PLAT_MARVELL_UART_BASE,
|
||
|
|
+ PLAT_MARVELL_UART_CLK_IN_HZ,
|
||
|
|
MARVELL_CONSOLE_BAUDRATE,
|
||
|
|
&marvell_boot_console);
|
||
|
|
if (rc == 0) {
|
||
|
|
@@ -58,8 +58,8 @@ void marvell_console_boot_end(void)
|
||
|
|
void marvell_console_runtime_init(void)
|
||
|
|
{
|
||
|
|
int rc =
|
||
|
|
- console_marvell_register(PLAT_MARVELL_BOOT_UART_BASE,
|
||
|
|
- PLAT_MARVELL_BOOT_UART_CLK_IN_HZ,
|
||
|
|
+ console_marvell_register(PLAT_MARVELL_UART_BASE,
|
||
|
|
+ PLAT_MARVELL_UART_CLK_IN_HZ,
|
||
|
|
MARVELL_CONSOLE_BAUDRATE,
|
||
|
|
&marvell_runtime_console);
|
||
|
|
if (rc == 0)
|