From: Rouven Czerwinski <r.czerwinski@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Subject: [PATCH v5 6/9] ARM: rpi: add NS16550 support
Date: Tue, 18 Dec 2018 11:47:41 +0100 [thread overview]
Message-ID: <ff5a5e32f29b3c3a035196fd350d9e520837b2c5.1545130027.git-series.r.czerwinski@pengutronix.de> (raw)
In-Reply-To: <cover.61efbc8cc3e2f39adccce96b40af1bb32a30bc66.1545130027.git-series.r.czerwinski@pengutronix.de>
Since the 16550 driver now supports the RPI3 miniuart, enable it in the default
config.
Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
arch/arm/configs/rpi_defconfig | 1 +
drivers/serial/serial_ns16550.c | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/arch/arm/configs/rpi_defconfig b/arch/arm/configs/rpi_defconfig
index 2bb6158..dc5ab1f 100644
--- a/arch/arm/configs/rpi_defconfig
+++ b/arch/arm/configs/rpi_defconfig
@@ -63,6 +63,7 @@ CONFIG_CMD_OF_PROPERTY=y
CONFIG_CMD_OFTREE=y
CONFIG_CMD_TIME=y
CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_DRIVER_SERIAL_NS16550=y
CONFIG_MCI=y
CONFIG_MCI_BCM283X=y
CONFIG_LED=y
diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c
index 256063a..5e5b671 100644
--- a/drivers/serial/serial_ns16550.c
+++ b/drivers/serial/serial_ns16550.c
@@ -253,11 +253,15 @@ static void ns16550_jz_init_port(struct console_device *cdev)
ns16550_serial_init_port(cdev);
}
+#define BCM2836_AUX_CLOCK_ENB 0x3f215004 /* BCM2835 AUX Clock enable register */
+#define BCM2836_AUX_CLOCK_EN_UART BIT(0) /* Bit 0 enables the Miniuart */
+
static void rpi_init_port(struct console_device *cdev)
{
+ uint8_t val;
struct ns16550_priv *priv = to_ns16550_priv(cdev);
- writeb(0x01, 0x3f215004);
+ writeb(BCM2835_AUX_CLOCK_EN_UART, BCM2835_AUX_CLOCK_ENB);
priv->plat.shift = 2;
/*
* We double the clock rate since the 16550 will divide by 16
--
git-series 0.9.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2018-12-18 10:48 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-18 10:47 [PATCH v5 0/9] Raspberry Pi miniuart support Rouven Czerwinski
2018-12-18 10:47 ` [PATCH v5 1/9] ARM: rpi: fix typo in rpi-common.c Rouven Czerwinski
2018-12-18 10:47 ` [PATCH v5 2/9] ARM: rpi: move clks into board specific rpi-common Rouven Czerwinski
2018-12-18 10:47 ` [PATCH v5 3/9] ARM: rpi: retrieve miniuart clock from firmware Rouven Czerwinski
2018-12-18 10:47 ` [PATCH v5 4/9] serial_ns16550: handle default reg-io-width Rouven Czerwinski
2018-12-18 10:47 ` [PATCH v5 5/9] serial_ns16550: add raspberry pi compatible and init Rouven Czerwinski
2018-12-18 10:47 ` Rouven Czerwinski [this message]
2018-12-19 11:26 ` [PATCH v5 6/9] ARM: rpi: add NS16550 support Rouven Czerwinski
2018-12-18 10:47 ` [PATCH v5 7/9] ARM: rpi: choose miniuart as stdout Rouven Czerwinski
2018-12-18 10:47 ` [PATCH v5 8/9] doc: bcm283x: remove miniuart overlay instruction Rouven Czerwinski
2018-12-18 10:47 ` [PATCH v5 9/9] ARM: rpi: use defines for uart bases Rouven Czerwinski
2018-12-18 14:06 ` [PATCH v5 0/9] Raspberry Pi miniuart support Sascha Hauer
2018-12-18 14:26 ` Peter Korsgaard
2018-12-19 5:21 ` Rouven Czerwinski
2018-12-19 8:29 ` Peter Korsgaard
2018-12-19 8:37 ` Rouven Czerwinski
2018-12-19 11:28 ` 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=ff5a5e32f29b3c3a035196fd350d9e520837b2c5.1545130027.git-series.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