From: Kevin Cernekee <cernekee@gmail.com>
To: gregkh@linuxfoundation.org, jslaby@suse.cz
Cc: robh@kernel.org, grant.likely@linaro.org, arnd@arndb.de,
geert@linux-m68k.org, f.fainelli@gmail.com, mbizon@freebox.fr,
jogo@openwrt.org, linux-mips@linux-mips.org,
linux-serial@vger.kernel.org, devicetree@vger.kernel.org
Subject: [PATCH V3 06/10] tty: serial: bcm63xx: Enable DT earlycon support
Date: Tue, 21 Oct 2014 15:23:02 -0700 [thread overview]
Message-ID: <1413930186-23168-7-git-send-email-cernekee@gmail.com> (raw)
In-Reply-To: <1413930186-23168-1-git-send-email-cernekee@gmail.com>
This enables early console output if there is a chosen/stdout-path
property referencing a UART node with the "brcm,bcm6345-uart" compatible
string. The bootloader sets up the pinmux and baud/parity/etc.
Tested on bcm3384 (MIPS, DT).
Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
---
drivers/tty/serial/Kconfig | 1 +
drivers/tty/serial/bcm63xx_uart.c | 20 ++++++++++++++++++++
2 files changed, 21 insertions(+)
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 815b652..fdd851e 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -1297,6 +1297,7 @@ config SERIAL_BCM63XX_CONSOLE
bool "Console on BCM63xx serial port"
depends on SERIAL_BCM63XX=y
select SERIAL_CORE_CONSOLE
+ select SERIAL_EARLYCON
help
If you have enabled the serial port on the BCM63xx CPU
you can make it the console by answering Y to this option.
diff --git a/drivers/tty/serial/bcm63xx_uart.c b/drivers/tty/serial/bcm63xx_uart.c
index b615af2..109dea7 100644
--- a/drivers/tty/serial/bcm63xx_uart.c
+++ b/drivers/tty/serial/bcm63xx_uart.c
@@ -782,6 +782,26 @@ static int __init bcm63xx_console_init(void)
console_initcall(bcm63xx_console_init);
+static void bcm_early_write(struct console *con, const char *s, unsigned n)
+{
+ struct earlycon_device *dev = con->data;
+
+ uart_console_write(&dev->port, s, n, bcm_console_putchar);
+ wait_for_xmitr(&dev->port);
+}
+
+static int __init bcm_early_console_setup(struct earlycon_device *device,
+ const char *opt)
+{
+ if (!device->port.membase)
+ return -ENODEV;
+
+ device->con->write = bcm_early_write;
+ return 0;
+}
+
+OF_EARLYCON_DECLARE(bcm63xx_uart, "brcm,bcm6345-uart", bcm_early_console_setup);
+
#define BCM63XX_CONSOLE (&bcm63xx_console)
#else
#define BCM63XX_CONSOLE NULL
--
2.1.1
next prev parent reply other threads:[~2014-10-21 22:23 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-21 22:22 [PATCH V3 00/10] bcm63xx_uart and of-serial updates Kevin Cernekee
2014-10-21 22:22 ` [PATCH V3 01/10] tty: serial: bcm63xx: Allow bcm63xx_uart to be built on other platforms Kevin Cernekee
2014-10-21 22:22 ` [PATCH V3 02/10] tty: serial: bcm63xx: Add support for unnamed clock outputs from DT Kevin Cernekee
2014-10-21 22:22 ` [PATCH V3 03/10] tty: serial: bcm63xx: Update the Kconfig help text Kevin Cernekee
2014-10-21 22:23 ` [PATCH V3 04/10] tty: serial: bcm63xx: Fix typo in MODULE_DESCRIPTION Kevin Cernekee
2014-10-21 22:23 ` [PATCH V3 05/10] Documentation: DT: Add entries for bcm63xx UART Kevin Cernekee
2014-10-21 22:23 ` Kevin Cernekee [this message]
2014-10-21 22:23 ` [PATCH V3 07/10] tty: serial: bcm63xx: Eliminate unnecessary request/release functions Kevin Cernekee
2014-10-21 22:23 ` [PATCH V3 08/10] tty: serial: of-serial: Suppress warnings if OF earlycon is invoked twice Kevin Cernekee
2014-10-21 22:23 ` [PATCH V3 09/10] tty: serial: of-serial: Allow OF earlycon to default to "on" Kevin Cernekee
2014-10-22 9:27 ` Rob Herring
2014-10-23 3:25 ` Kevin Cernekee
2014-10-23 4:47 ` Rob Herring
2014-10-23 14:31 ` Kevin Cernekee
2014-10-29 4:12 ` Kevin Cernekee
2014-10-21 22:23 ` [PATCH V3 10/10] MAINTAINERS: Add entry for rp2 (Rocketport Express/Infinity) driver Kevin Cernekee
2014-11-06 18:49 ` [PATCH V3 00/10] bcm63xx_uart and of-serial updates Greg KH
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=1413930186-23168-7-git-send-email-cernekee@gmail.com \
--to=cernekee@gmail.com \
--cc=arnd@arndb.de \
--cc=devicetree@vger.kernel.org \
--cc=f.fainelli@gmail.com \
--cc=geert@linux-m68k.org \
--cc=grant.likely@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=jogo@openwrt.org \
--cc=jslaby@suse.cz \
--cc=linux-mips@linux-mips.org \
--cc=linux-serial@vger.kernel.org \
--cc=mbizon@freebox.fr \
--cc=robh@kernel.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;
as well as URLs for NNTP newsgroup(s).