From ace146330e21051b45040a41d38a5dd9ea56e378 Mon Sep 17 00:00:00 2001 From: Rene Straub Date: Thu, 24 Oct 2019 09:17:11 +0200 Subject: [PATCH] nmhw24: don't enable uart0 in DTS by default - when using CAN shield, uart0 must not be enabled or I/O pins are locked by uart. - this was a backport from NRSW that has to be checked --- board/nm/nrhw24/board.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/board/nm/nrhw24/board.c b/board/nm/nrhw24/board.c index 88cff4444f..bb34ff3035 100644 --- a/board/nm/nrhw24/board.c +++ b/board/nm/nrhw24/board.c @@ -1203,7 +1203,10 @@ int ft_board_setup(void *blob, bd_t *bd) * Enable uart1 (ttyS0) always as kernel needs it as fallback console, * if (ttyS1) is not available as console. */ - ft_enable_node(blob, "/ocp/serial@44e09000"); + /* TODO: This does not work, as pins are then blocked for CAN + * Double check with NRSW + */ + /* ft_enable_node(blob, "/ocp/serial@44e09000"); */ return 0; }