From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759688AbbCDR2n (ORCPT ); Wed, 4 Mar 2015 12:28:43 -0500 Received: from mail-qa0-f41.google.com ([209.85.216.41]:48529 "EHLO mail-qa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933121AbbCDRYw (ORCPT ); Wed, 4 Mar 2015 12:24:52 -0500 From: Peter Hurley To: Greg Kroah-Hartman , Grant Likely , Rob Herring Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, Peter Hurley Subject: [PATCH -next 03/12] of: earlycon: Fixup earlycon console name and index Date: Wed, 4 Mar 2015 12:24:22 -0500 Message-Id: <1425489871-22415-4-git-send-email-peter@hurleysoftware.com> X-Mailer: git-send-email 2.3.1 In-Reply-To: <1425489871-22415-1-git-send-email-peter@hurleysoftware.com> References: <1425489871-22415-1-git-send-email-peter@hurleysoftware.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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