shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

earlycon: support aml-uart as the name for earlycon [1/1]

Browse Source 
PD#SWPL-6969

Problem:
For some historical reason, aml-uart is configured as the earlycon
name in uboot, which is not recognized by 4.9 kernel

Solution:
support aml-uart as the name for earlycon

Verify:
Ampere

Change-Id: I53463ac6d27ff3e911aa675cd5d10d6cbf26ba05
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
This commit is contained in:
Jiamin Ma
2019-04-11 13:37:51 +08:00
committed by Jianxin Pan
parent 1b1bcdbf50
commit c5801145d3
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/amlogic/uart/meson_uart.c
View File

@@ -956,6 +956,7 @@ static int __init meson_early_console_setup(struct earlycon_device *device,
return 0;
}
EARLYCON_DECLARE(aml_uart, meson_early_console_setup);
EARLYCON_DECLARE_COMP(aml-uart, meson_early_console_setup);
static struct console meson_serial_console = {
.name = AML_UART_DEV_NAME,

5
include/linux/serial_core.h
View File

@@ -375,6 +375,11 @@ extern const struct earlycon_id *__earlycon_table_end[];
#define EARLYCON_DECLARE(_name, fn) OF_EARLYCON_DECLARE(_name, "", fn)
#ifdef CONFIG_AMLOGIC_MODIFY
#define EARLYCON_DECLARE_COMP(_name, fn) \
_OF_EARLYCON_DECLARE(_name, "", fn, __LINE__ ## __COUNTER__)
#endif
extern int of_setup_earlycon(const struct earlycon_id *match,
unsigned long node,
const char *options);