[PATCH v4 03/11] of: earlycon: Fixup earlycon console name and index

Path	csiph.com!news.mixmin.net!feeds.phibee-telecom.net!news.panservice.it!bofh.it!news.nic.it!robomod
From	Peter Hurley <peter@hurleysoftware.com>
Newsgroups	linux.kernel
Subject	[PATCH v4 03/11] of: earlycon: Fixup earlycon console name and index
Date	Tue, 12 Jan 2016 20:50:02 +0100
Message-ID	<qQd74-5xe-5@gated-at.bofh.it> (permalink)
References	<pd2gV-7Bs-3@gated-at.bofh.it> <qQd74-5xe-7@gated-at.bofh.it>
X-Original-To	Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Masahiro Yamada <yamada.masahiro@socionext.com>
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=hurleysoftware-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ki9VuUJrSq3ZTTzZUwFhxfmXJEf2cvQVuh3i8f5BS7U=; b=tOo5bl0gvJ69BdpMU0ybNl4Mcn4I7dP3DbPj4hKhTFMHI0oUbqjKvHdqsPfxZyC+ZY AG2gjmm28ipYkW9cs2ha+rbDf8Aaewrl2c94tB92o5FDPSi/DIc2WxLm6C2/pj3w3EU/ yHdJ22BmZlLYCZVH8rpMUp1L4J6vb8dBCcKTB8vlyaasGmbslNFGq+XbZTdBf+ge264G Dvft20bUYdIJaf9ljOYDIm/4oV83dlN30yt0kEW5F2OVp+N/r0WiQcD7FFfk9CpYUqOu SzO8UbMnMmGwOsVN6QBS+A0Kpp9EhNH+mAl58SM8V3Sjpj/PUSErGzwl5BeR8BQZFuKD MYdQ==
X-Google-Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ki9VuUJrSq3ZTTzZUwFhxfmXJEf2cvQVuh3i8f5BS7U=; b=Ua6rruHh6JyoE1UEemZggJPBgARuf3BK6IvjeBXlupJNx9X8BQdkahXHZofm0OlUe1 4foVyd4dZ6TZ8vseMHNDxgat4EJ4ci/x01JMQDMEC2o/YoRDvo54lFEcsLdA+DpoR8yM Hlu7l+txcFbeWNd5r0NjR6CHomAeRhy+VWxiK6lymSZ0uraO+Ny4drpXxbh2Gg4dzBM4 oOAVnyeD0usLe+b5pFx+cWjBLNOtLOkJR2mV+rcgqClxl6GfbqJNgH9DsmKDyus88dDh 2MSiZh5GsyBmRGvyOwiAc5X4wqRRX7jsUAoG9GSJkLmPNX7EnJAWsKbnUP14hAxE7IvD eJeA==
X-Gm-Message-State	ALoCoQlLgxpUnPQwqpoZ5Q/cbCmWeP04Lf8fQtM1E37lT+mHZTnFzEHNmm+0RTCCzTjvnOCQ5hJ51DWSM5lian/FFJWrbG/GjQ==
X-Received	by 10.66.65.109 with SMTP id w13mr189824381pas.142.1452627716995; Tue, 12 Jan 2016 11:41:56 -0800 (PST)
X-Mailer	git-send-email 2.7.0
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	64
Organization	linux.* mail to news gateway
X-Original-Cc	Rob Herring <robh+dt@kernel.org>, Grant Likely <grant.likely@linaro.org>, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, Kevin Cernekee <cernekee@gmail.com>, Jon Hunter <jonathanh@nvidia.com>, Sebastian Frias <sf84@laposte.net>, Paul Burton <paul.burton@imgtec.com>, Peter Hurley <peter@hurleysoftware.com>
X-Original-Date	Tue, 12 Jan 2016 11:41:04 -0800
X-Original-Message-ID	<1452627672-9482-4-git-send-email-peter@hurleysoftware.com>
X-Original-References	<1428515119-25248-1-git-send-email-peter@hurleysoftware.com> <1452627672-9482-1-git-send-email-peter@hurleysoftware.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1307772

Show key headers only | View raw

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 | 6 +++---
 include/linux/serial_core.h   | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 1686118..ec14595 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -838,7 +838,7 @@ static int __init early_init_dt_scan_chosen_serial(void)
 		if (addr == OF_BAD_ADDR)
 			return -ENXIO;
 
-		of_setup_earlycon(addr, match->setup);
+		of_setup_earlycon(addr, match);
 		return 0;
 	}
 	return -ENODEV;
diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c
index 90b064f..47e54de 100644
--- a/drivers/tty/serial/earlycon.c
+++ b/drivers/tty/serial/earlycon.c
@@ -218,7 +218,7 @@ early_param("earlycon", param_setup_earlycon);
 #ifdef CONFIG_OF_EARLY_FLATTREE
 
 int __init of_setup_earlycon(unsigned long addr,
-			     int (*setup)(struct earlycon_device *, const char *))
+			     const struct earlycon_id *match)
 {
 	int err;
 	struct uart_port *port = &early_console_dev.port;
@@ -229,8 +229,8 @@ int __init of_setup_earlycon(unsigned long addr,
 	port->uartclk = BASE_BAUD * 16;
 	port->membase = earlycon_map(addr, SZ_4K);
 
-	early_console_dev.con->data = &early_console_dev;
-	err = setup(&early_console_dev, NULL);
+	earlycon_init(&early_console_dev, match->name);
+	err = match->setup(&early_console_dev, NULL);
 	if (err < 0)
 		return err;
 	if (!early_console_dev.con->write)
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 25e0514..63fdb55 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -359,8 +359,7 @@ extern const struct earlycon_id __earlycon_table_end[];
 #define EARLYCON_DECLARE(_name, fn)	OF_EARLYCON_DECLARE(_name, "", fn)
 
 extern int setup_earlycon(char *buf);
-extern int of_setup_earlycon(unsigned long addr,
-			     int (*setup)(struct earlycon_device *, const char *));
+extern int of_setup_earlycon(unsigned long addr, const struct earlycon_id *match);
 
 struct uart_port *uart_get_console(struct uart_port *ports, int nr,
 				   struct console *c);
-- 
2.7.0

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH v4 03/11] of: earlycon: Fixup earlycon console name and index Peter Hurley <peter@hurleysoftware.com> - 2016-01-12 20:50 +0100

csiph-web