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 v6 5/9] serial_ns16550: add raspberry pi compatible and init
Date: Tue, 15 Jan 2019 06:44:05 +0100	[thread overview]
Message-ID: <a7992bfa5f3d5ff18e81a38d8744ddbfbefe254c.1547530950.git-series.r.czerwinski@pengutronix.de> (raw)
In-Reply-To: <cover.cea99e013da63859278229c6e1566362a1800ff4.1547530950.git-series.r.czerwinski@pengutronix.de>

Add the compatible for the Raspberry Pi AUX UART and an init function which
enables it via the aux register and configures the correct shift value.

Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
 drivers/serial/serial_ns16550.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c
index 8ddcfdb..ccd082e 100644
--- a/drivers/serial/serial_ns16550.c
+++ b/drivers/serial/serial_ns16550.c
@@ -253,6 +253,23 @@ 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)
+{
+	struct ns16550_priv *priv = to_ns16550_priv(cdev);
+
+	writeb(BCM2836_AUX_CLOCK_EN_UART, BCM2836_AUX_CLOCK_ENB);
+	priv->plat.shift = 2;
+	/*
+	 * We double the clock rate since the 16550 will divide by 16
+	 * (instead of 8 required by the BCM2835 peripheral manual)
+	 */
+	priv->plat.clock = priv->plat.clock*2;
+	ns16550_serial_init_port(cdev);
+}
+
 /*********** Exposed Functions **********************************/
 
 /**
@@ -353,6 +370,11 @@ static __maybe_unused struct ns16550_drvdata tegra_drvdata = {
 	.linux_console_name = "ttyS",
 };
 
+static __maybe_unused struct ns16550_drvdata rpi_drvdata = {
+	.init_port = rpi_init_port,
+	.linux_console_name = "ttyS",
+};
+
 static int ns16550_init_iomem(struct device_d *dev, struct ns16550_priv *priv)
 {
 	struct resource *iores;
@@ -528,6 +550,12 @@ static struct of_device_id ns16550_serial_dt_ids[] = {
 		.data = &jz_drvdata,
 	},
 #endif
+#if IS_ENABLED(CONFIG_MACH_RPI_COMMON)
+	{
+		.compatible = "brcm,bcm2835-aux-uart",
+		.data = &rpi_drvdata,
+	},
+#endif
 	{
 		/* sentinel */
 	},
-- 
git-series 0.9.1

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

  parent reply	other threads:[~2019-01-15  5:44 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-15  5:44 [PATCH v6 0/9] Raspberry Pi miniuart support Rouven Czerwinski
2019-01-15  5:44 ` [PATCH v6 1/9] ARM: rpi: fix typo in rpi-common.c Rouven Czerwinski
2019-01-15  5:44 ` [PATCH v6 2/9] ARM: rpi: move clks into board specific rpi-common Rouven Czerwinski
2019-01-15  5:44 ` [PATCH v6 3/9] ARM: rpi: retrieve miniuart clock from firmware Rouven Czerwinski
2019-01-15  5:44 ` [PATCH v6 4/9] serial_ns16550: handle default reg-io-width Rouven Czerwinski
2019-01-15  5:44 ` Rouven Czerwinski [this message]
2019-01-15  5:44 ` [PATCH v6 6/9] ARM: rpi: add NS16550 support Rouven Czerwinski
2019-01-15  5:44 ` [PATCH v6 7/9] ARM: rpi: choose miniuart as stdout Rouven Czerwinski
2019-01-15  5:44 ` [PATCH v6 8/9] doc: bcm283x: remove miniuart overlay instruction Rouven Czerwinski
2019-01-15  5:44 ` [PATCH v6 9/9] ARM: rpi: use defines for uart bases Rouven Czerwinski
2019-01-15 11:01 ` [PATCH v6 0/9] Raspberry Pi miniuart support Roland Hieber
2019-01-15 12:51   ` Rouven Czerwinski
2019-01-15 13:19     ` Roland Hieber
2019-01-15 23:47     ` Roland Hieber
2019-01-15 23:48 ` Roland Hieber
2019-01-16  7:46 ` Sascha Hauer

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=a7992bfa5f3d5ff18e81a38d8744ddbfbefe254c.1547530950.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