<div dir="ltr"><div>Hii,</div><div>This is a reminder message since this patch has been unnoticed for a while.</div><div>I have tested it on Raspberry Pi 3 and it works fine. There is also another patch</div><div><a href="https://lists.rtems.org/pipermail/devel/2020-February/057194.html">https://lists.rtems.org/pipermail/devel/2020-February/057194.html</a>, please</div><div>do have a look at these.</div><div><br></div><div>Thank you.</div>Niteesh<br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Feb 10, 2020 at 12:52 AM G S Niteesh <<a href="mailto:gsnb.gn@gmail.com" target="_blank">gsnb.gn@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">This patch adds driver for Mini UART present in Raspberry Pi 3<br>
and above, this UART is currently used as the primary UART in<br>
these models.<br>
The Mini UART is similar to ns16550, this driver is built<br>
upon libchip/ns16550.<br>
---<br>
bsps/arm/raspberrypi/console/console-config.c | 118 ++++++++++++++++--<br>
bsps/arm/raspberrypi/include/bsp/usart.h | 1 +<br>
2 files changed, 110 insertions(+), 9 deletions(-)<br>
<br>
diff --git a/bsps/arm/raspberrypi/console/console-config.c b/bsps/arm/raspberrypi/console/console-config.c<br>
index 48c4c6a3ec..62196786dd 100644<br>
--- a/bsps/arm/raspberrypi/console/console-config.c<br>
+++ b/bsps/arm/raspberrypi/console/console-config.c<br>
@@ -24,6 +24,7 @@<br>
<br>
#include <libchip/serial.h><br>
#include <libfdt.h><br>
+#include <libchip/ns16550.h><br>
<br>
#include <bspopts.h><br>
#include <bsp/usart.h><br>
@@ -34,35 +35,103 @@<br>
#include <bsp/console-termios.h><br>
#include <bsp/fdt.h><br>
#include <bsp/fatal.h><br>
+#include <bsp/gpio.h><br>
+#include <bsp/rpi-gpio.h><br>
<br>
-<br>
-#define UART0 "/dev/ttyS0"<br>
+/**<br>
+ * UART0 - PL011<br>
+ * UART1 - Mini UART<br>
+ */<br>
+#define PL011 "/dev/ttyAMA0"<br>
+#define MINIUART "/dev/ttyS0"<br>
#define FBCONS "/dev/fbcons"<br>
<br>
arm_pl011_context pl011_context;<br>
+ns16550_context mini_uart_context;<br>
<br>
rpi_fb_context fb_context;<br>
<br>
-static void output_char_serial(char c)<br>
+static void output_char_pl011(char c)<br>
{<br>
arm_pl011_write_polled(&pl011_context.base, c);<br>
}<br>
<br>
+static void output_char_mini_uart(char c)<br>
+{<br>
+ ns16550_polled_putchar(&mini_uart_context.base, c);<br>
+}<br>
+<br>
void output_char_fb(char c)<br>
{<br>
fbcons_write_polled(&fb_context.base, c);<br>
}<br>
<br>
+static uint8_t mini_uart_get_reg(uintptr_t port, uint8_t index)<br>
+{<br>
+ volatile uint32_t *val = (volatile uint32_t *)port + index;<br>
+ return (uint8_t) *val;<br>
+}<br>
+<br>
+static void mini_uart_set_reg(uintptr_t port, uint8_t index, uint8_t val)<br>
+{<br>
+ volatile uint32_t *reg = (volatile uint32_t *)port + index;<br>
+ *reg = val;<br>
+}<br>
+<br>
static void init_ctx_arm_pl011(<br>
const void *fdt,<br>
int node<br>
)<br>
{<br>
arm_pl011_context *ctx = &pl011_context;<br>
- rtems_termios_device_context_initialize(&ctx->base, "UART");<br>
+ rtems_termios_device_context_initialize(&ctx->base, "PL011UART");<br>
ctx->regs = raspberrypi_get_reg_of_node(fdt, node);<br>
}<br>
<br>
+static uint32_t calculate_baud_divisor(<br>
+ ns16550_context *ctx,<br>
+ uint32_t baud<br>
+)<br>
+{<br>
+ uint32_t baudDivisor = (ctx->clock / (8 * baud)) - 1;<br>
+ return baudDivisor;<br>
+}<br>
+<br>
+static void init_ctx_mini_uart(<br>
+ const void *fdt,<br>
+ int node<br>
+)<br>
+{<br>
+ const char *status;<br>
+ int len;<br>
+ ns16550_context *ctx;<br>
+<br>
+ memset(&mini_uart_context, 0, sizeof(mini_uart_context));<br>
+ ctx = &mini_uart_context;<br>
+<br>
+ rtems_termios_device_context_initialize(&ctx->base, "MiniUART");<br>
+<br>
+ status = fdt_getprop(fdt, node, "status", &len);<br>
+ if ( status == NULL || strcmp(status, "disabled" ) == 0){<br>
+ return ;<br>
+ }<br>
+<br>
+ ctx->port = (uintptr_t) raspberrypi_get_reg_of_node(fdt, node);<br>
+ ctx->initial_baud = MINI_UART_DEFAULT_BAUD;<br>
+ ctx->clock = BCM2835_CLOCK_FREQ;<br>
+ ctx->calculate_baud_divisor = calculate_baud_divisor;<br>
+ ctx->get_reg = mini_uart_get_reg;<br>
+ ctx->set_reg = mini_uart_set_reg;<br>
+<br>
+ rtems_gpio_bsp_select_specific_io(0, 14, RPI_ALT_FUNC_5, NULL);<br>
+ rtems_gpio_bsp_select_specific_io(0, 15, RPI_ALT_FUNC_5, NULL);<br>
+ rtems_gpio_bsp_set_resistor_mode(0, 14, NO_PULL_RESISTOR);<br>
+ rtems_gpio_bsp_set_resistor_mode(0, 15, NO_PULL_RESISTOR);<br>
+<br>
+ BCM2835_REG(AUX_ENABLES) |= 0x1;<br>
+ ns16550_probe(&ctx->base);<br>
+}<br>
+<br>
static void register_fb( void )<br>
{<br>
if (fbcons_probe(&fb_context.base) == true) {<br>
@@ -87,16 +156,28 @@ static void console_select( void )<br>
link(FBCONS, CONSOLE_DEVICE_NAME);<br>
return ;<br>
}<br>
+ } else if ( strncmp( opt, MINIUART, sizeof(MINIUART) - 1 ) == 0) {<br>
+ BSP_output_char = output_char_mini_uart;<br>
+ link(MINIUART, CONSOLE_DEVICE_NAME);<br>
+ } else if ( strncmp( opt, PL011, sizeof(PL011) - 1 ) == 0) {<br>
+ BSP_output_char = output_char_pl011;<br>
+ link(PL011, CONSOLE_DEVICE_NAME);<br>
}<br>
+ }else {<br>
+ /**<br>
+ * If no command line option was given, default to PL011.<br>
+ */<br>
+ BSP_output_char = output_char_pl011;<br>
+ link(PL011, CONSOLE_DEVICE_NAME);<br>
}<br>
- BSP_output_char = output_char_serial;<br>
- link(UART0, CONSOLE_DEVICE_NAME);<br>
}<br>
<br>
static void uart_probe(void)<br>
{<br>
static bool initialized = false;<br>
const void *fdt;<br>
+ const char *console;<br>
+ int len;<br>
int node;<br>
<br>
if ( initialized ) {<br>
@@ -104,17 +185,29 @@ static void uart_probe(void)<br>
}<br>
<br>
fdt = bsp_fdt_get();<br>
- node = fdt_node_offset_by_compatible(fdt, -1, "brcm,bcm2835-pl011");<br>
<br>
+ node = fdt_node_offset_by_compatible(fdt, -1, "brcm,bcm2835-pl011");<br>
init_ctx_arm_pl011(fdt, node);<br>
<br>
+ node = fdt_node_offset_by_compatible(fdt, -1, "brcm,bcm2835-aux-uart");<br>
+ init_ctx_mini_uart(fdt, node);<br>
+<br>
+ node = fdt_path_offset(fdt, "/aliases");<br>
+ console = fdt_getprop(fdt, node, "serial0", &len);<br>
+<br>
+ if ( strcmp(console, "/soc/serial@7e215040" ) == 0) {<br>
+ BSP_output_char = output_char_mini_uart;<br>
+ }else {<br>
+ BSP_output_char = output_char_pl011;<br>
+ }<br>
+<br>
initialized = true;<br>
}<br>
<br>
static void output_char(char c)<br>
{<br>
uart_probe();<br>
- output_char_serial(c);<br>
+ (*BSP_output_char)(c);<br>
}<br>
<br>
rtems_status_code console_initialize(<br>
@@ -127,12 +220,19 @@ rtems_status_code console_initialize(<br>
<br>
uart_probe();<br>
rtems_termios_device_install(<br>
- UART0,<br>
+ PL011,<br>
&arm_pl011_fns,<br>
NULL,<br>
&pl011_context.base<br>
);<br>
<br>
+ rtems_termios_device_install(<br>
+ MINIUART,<br>
+ &ns16550_handler_polled,<br>
+ NULL,<br>
+ &mini_uart_context.base<br>
+ );<br>
+<br>
register_fb();<br>
<br>
console_select();<br>
diff --git a/bsps/arm/raspberrypi/include/bsp/usart.h b/bsps/arm/raspberrypi/include/bsp/usart.h<br>
index abbf53626c..6af1844b3c 100644<br>
--- a/bsps/arm/raspberrypi/include/bsp/usart.h<br>
+++ b/bsps/arm/raspberrypi/include/bsp/usart.h<br>
@@ -33,6 +33,7 @@ extern "C" {<br>
#endif /* __cplusplus */<br>
<br>
#define PL011_DEFAULT_BAUD 115000<br>
+#define MINI_UART_DEFAULT_BAUD 115200<br>
#define BCM2835_PL011_BASE (RPI_PERIPHERAL_BASE + 0x201000)<br>
<br>
#ifdef __cplusplus<br>
-- <br>
2.17.1<br>
<br>
</blockquote></div></div>