mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Rouven Czerwinski <r.czerwinski@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Subject: [PATCH] ARM: nitrogen6: add lowlevel UART initialization
Date: Thu,  2 Jan 2020 11:23:35 +0100	[thread overview]
Message-ID: <20200102102334.73726-1-r.czerwinski@pengutronix.de> (raw)

Mux UART1 and UART2 correctly to allow usage of DEBUG_LL.
This commit has only been tested on nitrogen6q.

Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
 .../boundarydevices-nitrogen6/lowlevel.c      | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/arch/arm/boards/boundarydevices-nitrogen6/lowlevel.c b/arch/arm/boards/boundarydevices-nitrogen6/lowlevel.c
index 74ff71fc24..47c231396d 100644
--- a/arch/arm/boards/boundarydevices-nitrogen6/lowlevel.c
+++ b/arch/arm/boards/boundarydevices-nitrogen6/lowlevel.c
@@ -1,16 +1,40 @@
 #include <common.h>
+#include <debug_ll.h>
 #include <mach/generic.h>
 #include <mach/esdctl.h>
 #include <asm/barebox-arm.h>
+#include <serial/imx-uart.h>
 
 extern char __dtb_imx6q_nitrogen6x_start[];
 
+static inline void setup_uart(void)
+{
+   void __iomem *iomuxbase = (void *)MX6_IOMUXC_BASE_ADDR;
+
+   //UART 1
+   writel(0x1, iomuxbase + 0x02a8);
+   writel(0x1, iomuxbase + 0x02ac);
+
+   //UART 2
+   writel(0x4, iomuxbase + 0x00bc);
+   writel(0x4, iomuxbase + 0x00c0);
+   writel(0x0, iomuxbase + 0x0928);
+
+   imx6_ungate_all_peripherals();
+   imx6_uart_setup((void *)MX6_UART2_BASE_ADDR);
+   pbl_set_putc(imx_uart_putc, (void *)MX6_UART2_BASE_ADDR);
+}
+
+
 ENTRY_FUNCTION(start_imx6q_nitrogen6x_1g, r0, r1, r2)
 {
 	void *fdt;
 
 	imx6_cpu_lowlevel_init();
 
+	if (IS_ENABLED(CONFIG_DEBUG_LL))
+		setup_uart();
+
 	fdt = __dtb_imx6q_nitrogen6x_start + get_runtime_offset();
 
 	imx6q_barebox_entry(fdt);
-- 
2.24.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

             reply	other threads:[~2020-01-02 10:23 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-02 10:23 Rouven Czerwinski [this message]
2020-01-02 10:41 ` Ahmad Fatoum
2020-01-06  9:46 ` Lucas Stach
2020-01-06 10:09   ` Rouven Czerwinski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200102102334.73726-1-r.czerwinski@pengutronix.de \
    --to=r.czerwinski@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox