From 70187de497f36213e2bb243022a3474d631d19a4 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 6 Mar 2019 10:12:31 +0100 Subject: ARM: rpi: Add mini UART debug_ll support The raspberry pi 3 comes up with the mini UART as default, so allow to use it for debug_ll output. Signed-off-by: Sascha Hauer --- arch/arm/mach-bcm283x/include/mach/debug_ll.h | 37 +++++++++++++++++++++++++++ common/Kconfig | 6 +++++ 2 files changed, 43 insertions(+) diff --git a/arch/arm/mach-bcm283x/include/mach/debug_ll.h b/arch/arm/mach-bcm283x/include/mach/debug_ll.h index 2d2103e338..99c59d011b 100644 --- a/arch/arm/mach-bcm283x/include/mach/debug_ll.h +++ b/arch/arm/mach-bcm283x/include/mach/debug_ll.h @@ -22,14 +22,51 @@ #ifdef CONFIG_DEBUG_RPI1_UART +static inline void debug_ll_init(void) +{ + /* Configured by ROM */ +} + #define DEBUG_LL_UART_ADDR BCM2835_PL011_BASE #include #elif defined CONFIG_DEBUG_RPI2_3_UART +static inline void debug_ll_init(void) +{ + /* Configured by ROM */ +} + #define DEBUG_LL_UART_ADDR BCM2836_PL011_BASE #include +#elif defined CONFIG_DEBUG_RPI3_MINI_UART + +static inline uint8_t debug_ll_read_reg(int reg) +{ + return readb(BCM2836_MINIUART_BASE + (reg << 2)); +} + +static inline void debug_ll_write_reg(int reg, uint8_t val) +{ + writeb(val, BCM2836_MINIUART_BASE + (reg << 2)); +} + +#define BCM2836_AUX_CLOCK_ENB 0x3f215004 /* BCM2835 AUX Clock enable register */ +#define BCM2836_AUX_CLOCK_EN_UART BIT(0) /* Bit 0 enables the Miniuart */ + +#include + +static inline void debug_ll_init(void) +{ + uint16_t divisor; + + writeb(BCM2836_AUX_CLOCK_EN_UART, BCM2836_AUX_CLOCK_ENB); + + divisor = debug_ll_ns16550_calc_divisor(250000000 * 2); + debug_ll_ns16550_init(divisor); +} + #endif #endif /* __MACH_BCM2835_DEBUG_LL_H__ */ diff --git a/common/Kconfig b/common/Kconfig index 563cf15fb1..0c6acfcddb 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -1173,6 +1173,12 @@ config DEBUG_RPI2_UART Say Y here if you want low-level debugging support on RaspberryPi 2 and 3 boards. +config DEBUG_RPI3_MINI_UART + bool "RaspberryPi 3 mini UART + depends on ARCH_BCM283X + help + Say Y here if you want low-level debugging support on + RaspberryPi 3 board mini UART. endchoice config DEBUG_IMX_UART_PORT -- cgit v1.2.3