| Message ID | 09f2c419994281fca7968142e52d969542370d1c.1455782238.git.michal.simek@xilinx.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 02/17/2016 11:57 PM, Michal Simek wrote: > Support early console setup via DT for all listed compatible strings. > Remove EARLYCON_DECLARE which was done by: > "Use common framework for earlycon declarations" > (sha1: 2eaa790989e03900298ad24f77f1086dbbc1aebd) > when OF_EARLYCON_DECLARE is defined. Reviewed-by: Peter Hurley <peter@hurleysoftware.com>
Hi Greg, On 18.2.2016 17:50, Peter Hurley wrote: > On 02/17/2016 11:57 PM, Michal Simek wrote: >> Support early console setup via DT for all listed compatible strings. >> Remove EARLYCON_DECLARE which was done by: >> "Use common framework for earlycon declarations" >> (sha1: 2eaa790989e03900298ad24f77f1086dbbc1aebd) >> when OF_EARLYCON_DECLARE is defined. > > Reviewed-by: Peter Hurley <peter@hurleysoftware.com> Can you please add it your queue for 4.6? Or can we merge it via arm-soc tree as was suggested by Arnd here? https://lkml.org/lkml/2016/2/16/315 Thanks, Michal
On Thu, Feb 25, 2016 at 02:04:23PM +0100, Michal Simek wrote: > Hi Greg, > > On 18.2.2016 17:50, Peter Hurley wrote: > > On 02/17/2016 11:57 PM, Michal Simek wrote: > >> Support early console setup via DT for all listed compatible strings. > >> Remove EARLYCON_DECLARE which was done by: > >> "Use common framework for earlycon declarations" > >> (sha1: 2eaa790989e03900298ad24f77f1086dbbc1aebd) > >> when OF_EARLYCON_DECLARE is defined. > > > > Reviewed-by: Peter Hurley <peter@hurleysoftware.com> > > Can you please add it your queue for 4.6? > Or can we merge it via arm-soc tree as was suggested by Arnd here? > https://lkml.org/lkml/2016/2/16/315 I can take it, thanks. greg k-h
diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c index 131a3117fbbb..cd46e64c4255 100644 --- a/drivers/tty/serial/xilinx_uartps.c +++ b/drivers/tty/serial/xilinx_uartps.c @@ -1077,7 +1077,9 @@ static int __init cdns_early_console_setup(struct earlycon_device *device, return 0; } -EARLYCON_DECLARE(cdns, cdns_early_console_setup); +OF_EARLYCON_DECLARE(cdns, "xlnx,xuartps", cdns_early_console_setup); +OF_EARLYCON_DECLARE(cdns, "cdns,uart-r1p8", cdns_early_console_setup); +OF_EARLYCON_DECLARE(cdns, "cdns,uart-r1p12", cdns_early_console_setup); /** * cdns_uart_console_write - perform write operation
Support early console setup via DT for all listed compatible strings. Remove EARLYCON_DECLARE which was done by: "Use common framework for earlycon declarations" (sha1: 2eaa790989e03900298ad24f77f1086dbbc1aebd) when OF_EARLYCON_DECLARE is defined. Signed-off-by: Michal Simek <michal.simek@xilinx.com> --- Changes in v2: - Separate serial patch from others - Remove EARLYCON_DECLARE and use the same earlycon name with different compatible string as was pointed by Peter Hurley - Extend commit message drivers/tty/serial/xilinx_uartps.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)