LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Peter Hurley <peter@hurleysoftware.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Grant Likely <grant.likely@linaro.org>,
	Rob Herring <robh+dt@kernel.org>
Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org,
	Peter Hurley <peter@hurleysoftware.com>
Subject: [PATCH -next 03/12] of: earlycon: Fixup earlycon console name and index
Date: Wed,  4 Mar 2015 12:24:22 -0500	[thread overview]
Message-ID: <1425489871-22415-4-git-send-email-peter@hurleysoftware.com> (raw)
In-Reply-To: <1425489871-22415-1-git-send-email-peter@hurleysoftware.com>

Use the console name embedded in the OF earlycon table by the
OF_EARLYCON_DECLARE() macro to initialize the struct console::name
and ::index fields.

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
---
 drivers/of/fdt.c              | 2 +-
 drivers/tty/serial/earlycon.c | 5 +++--
 include/linux/serial_core.h   | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 5100742..5b67c6a 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -798,7 +798,7 @@ int __init early_init_dt_scan_chosen_serial(void)
 		if (!addr)
 			return -ENXIO;
 
-		of_setup_earlycon(addr, match->data);
+		of_setup_earlycon(addr, match);
 		return 0;
 	}
 	return -ENODEV;
diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c
index bfe21b8..04aa22c 100644
--- a/drivers/tty/serial/earlycon.c
+++ b/drivers/tty/serial/earlycon.c
@@ -218,17 +218,18 @@ static int __init param_setup_earlycon(char *buf)
 early_param("earlycon", param_setup_earlycon);
 
 int __init of_setup_earlycon(unsigned long addr,
-			     int (*setup)(struct earlycon_device *, const char *))
+			     const struct of_device_id *match)
 {
 	int err;
 	struct uart_port *port = &early_console_dev.port;
+	int (*setup)(struct earlycon_device *, const char *) = match->data;
 
 	port->iotype = UPIO_MEM;
 	port->mapbase = addr;
 	port->uartclk = BASE_BAUD * 16;
 	port->membase = earlycon_map(addr, SZ_4K);
 
-	early_console_dev.con->data = &early_console_dev;
+	earlycon_init(&early_console_dev, match->name);
 	err = setup(&early_console_dev, NULL);
 	if (err < 0)
 		return err;
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index c523785..a2db5bd 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -346,7 +346,7 @@ struct earlycon_id {
 
 extern int setup_earlycon(char *buf);
 extern int of_setup_earlycon(unsigned long addr,
-			     int (*setup)(struct earlycon_device *, const char *));
+			     const struct of_device_id *match);
 
 #define EARLYCON_DECLARE(_name, func)					\
 	static const struct earlycon_id __earlycon_##_name		\
-- 
2.3.1


  parent reply	other threads:[~2015-03-04 17:28 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-04 17:24 [PATCH -next 00/12] OF earlycon cleanup Peter Hurley
2015-03-04 17:24 ` [PATCH -next 01/12] serial: earlycon: Fixup earlycon console name and index Peter Hurley
2015-03-04 17:24 ` [PATCH -next 02/12] serial: earlycon: Emit earlycon name in the OF table Peter Hurley
2015-03-05 15:13   ` Rob Herring
2015-03-06 16:05     ` Peter Hurley
2015-03-04 17:24 ` Peter Hurley [this message]
2015-03-04 17:24 ` [PATCH -next 04/12] of: earlycon: Add options string handling Peter Hurley
2015-03-05 16:28   ` Rob Herring
2015-03-04 17:24 ` [PATCH -next 05/12] of: earlycon: Initialize port fields from DT properties Peter Hurley
2015-03-05 16:16   ` Rob Herring
2015-03-04 17:24 ` [PATCH -next 06/12] of: earlycon: Move address translation to of_setup_earlycon() Peter Hurley
2015-03-05 16:25   ` Rob Herring
2015-03-04 17:24 ` [PATCH -next 07/12] serial: earlycon: Common log banner for command line and DT Peter Hurley
2015-03-05 12:02   ` Geert Uytterhoeven
2015-03-05 12:24     ` Peter Hurley
2015-03-04 17:24 ` [PATCH -next 08/12] serial: earlycon: Id the earlycon "driver" in banner Peter Hurley
2015-03-04 17:24 ` [PATCH -next 09/12] of: earlycon: Allow multiple OF_EARLYCON_DECLARE() with same name Peter Hurley
2015-03-04 17:24 ` [PATCH -next 10/12] of: earlycon: Log more helpful message if earlycon not found Peter Hurley
2015-03-04 17:24 ` [PATCH -next 11/12] serial: 8250_early: Use port->regshift Peter Hurley
2015-03-04 17:24 ` [PATCH -next 12/12] serial: 8250_omap: Add omap8250 earlycon Peter Hurley
2015-03-04 17:33 ` [PATCH -next 00/12] OF earlycon cleanup Peter Hurley

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=1425489871-22415-4-git-send-email-peter@hurleysoftware.com \
    --to=peter@hurleysoftware.com \
    --cc=grant.likely@linaro.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-serial@vger.kernel.org \
    --cc=robh+dt@kernel.org \
    --subject='Re: [PATCH -next 03/12] of: earlycon: Fixup earlycon console name and index' \
    /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

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).