[PATCH 03/12] ARM: versatile: drop platform code to register UART

Sascha Hauer s.hauer at pengutronix.de
Tue May 2 02:14:10 PDT 2023


Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 arch/arm/boards/versatile/versatilepb.c |  2 --
 arch/arm/mach-versatile/core.c          | 24 ------------------------
 include/mach/versatile/init.h           |  8 --------
 3 files changed, 34 deletions(-)
 delete mode 100644 include/mach/versatile/init.h

diff --git a/arch/arm/boards/versatile/versatilepb.c b/arch/arm/boards/versatile/versatilepb.c
index 923dbd2564..c5ce46e525 100644
--- a/arch/arm/boards/versatile/versatilepb.c
+++ b/arch/arm/boards/versatile/versatilepb.c
@@ -14,7 +14,6 @@
 #include <asm/armlinux.h>
 #include <asm/system_info.h>
 #include <generated/mach-types.h>
-#include <mach/versatile/init.h>
 #include <mach/versatile/platform.h>
 #include <environment.h>
 #include <linux/sizes.h>
@@ -36,7 +35,6 @@ static int vpb_console_init(void)
 	barebox_set_hostname(hostname);
 	barebox_set_model(model);
 
-	versatile_register_uart(0);
 	return 0;
 }
 console_initcall(vpb_console_init);
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
index 69ff82e9a5..8e32d10302 100644
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
@@ -39,7 +39,6 @@
 #include <asm/armlinux.h>
 
 #include <mach/versatile/platform.h>
-#include <mach/versatile/init.h>
 
 
 /* 1Mhz / 256 */
@@ -101,29 +100,6 @@ static int vpb_clocksource_init(void)
 
 core_initcall(vpb_clocksource_init);
 
-void versatile_register_uart(unsigned id)
-{
-	resource_size_t start;
-
-	switch (id) {
-	case 0:
-		start = VERSATILE_UART0_BASE;
-		break;
-	case 1:
-		start = VERSATILE_UART1_BASE;
-		break;
-	case 2:
-		start = VERSATILE_UART2_BASE;
-		break;
-	case 3:
-		start = VERSATILE_UART3_BASE;
-		break;
-	default:
-		return;
-	}
-	amba_apb_device_add(NULL, "uart-pl011", id, start, 4096, NULL, 0);
-}
-
 static void __noreturn versatile_reset_soc(struct restart_handler *rst)
 {
 	u32 val;
diff --git a/include/mach/versatile/init.h b/include/mach/versatile/init.h
deleted file mode 100644
index e47aa857a1..0000000000
--- a/include/mach/versatile/init.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#ifndef __VERSATILE_INIT_H__
-#define __VERSATILE_INIT_H__
-
-void versatile_register_uart(unsigned id);
-
-#endif
-- 
2.39.2




More information about the barebox mailing list