[PATCH] ARM: k3: fix debug_ll

Sascha Hauer s.hauer at pengutronix.de
Wed Nov 6 23:28:44 PST 2024


commit e64990099c8f ("debug_ll ns16550: Add base address argument to
register functions") missed the change for k3. Add the change to fix
k3 debug_ll support.

Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 include/mach/k3/debug_ll.h | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/include/mach/k3/debug_ll.h b/include/mach/k3/debug_ll.h
index 2433bb8f2e..29bd4015ab 100644
--- a/include/mach/k3/debug_ll.h
+++ b/include/mach/k3/debug_ll.h
@@ -16,19 +16,13 @@
 #define __K3_UART_BASE(soc, num) soc##_UART##num##_BASE
 #define K3_UART_BASE(soc, num) __K3_UART_BASE(soc, num)
 
-static inline uint8_t debug_ll_read_reg(int reg)
+static inline uint8_t debug_ll_read_reg(void __iomem *base, int reg)
 {
-	void __iomem *base = (void *)K3_UART_BASE(K3_DEBUG_SOC,
-					CONFIG_DEBUG_K3_UART_PORT);
-
 	return readb(base + (reg << 2));
 }
 
-static inline void debug_ll_write_reg(int reg, uint8_t val)
+static inline void debug_ll_write_reg(void __iomem *base, int reg, uint8_t val)
 {
-	void __iomem *base = (void *)K3_UART_BASE(K3_DEBUG_SOC,
-					CONFIG_DEBUG_K3_UART_PORT);
-
 	writeb(val, base + (reg << 2));
 }
 
@@ -41,7 +35,10 @@ static inline void debug_ll_init(void)
 
 static inline void PUTC_LL(int c)
 {
-	debug_ll_ns16550_putc(c);
+	void __iomem *base = (void *)K3_UART_BASE(K3_DEBUG_SOC,
+					CONFIG_DEBUG_K3_UART_PORT);
+
+	debug_ll_ns16550_putc(base, c);
 }
 
 #endif
-- 
2.39.5




More information about the barebox mailing list