diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-02-03 09:55:54 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-02-03 09:55:54 +0100 |
commit | 601bf0fcc62854af68b35d857696be9a4a9e567d (patch) | |
tree | 39e6eb29bdd79e49b474a64558d81f6fb9d34c94 /drivers/serial | |
parent | 701d565c2a1c50e84e7035048968bc81fd869c87 (diff) | |
parent | a4d39ca0f1e0ceeab4e1f817a9c32b9c0a4f01c2 (diff) | |
download | barebox-601bf0fcc62854af68b35d857696be9a4a9e567d.tar.gz barebox-601bf0fcc62854af68b35d857696be9a4a9e567d.tar.xz |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/serial_imx.c | 1 | ||||
-rw-r--r-- | drivers/serial/serial_ns16550.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/serial/serial_imx.c b/drivers/serial/serial_imx.c index 8468fa0adc..e0bd185c8b 100644 --- a/drivers/serial/serial_imx.c +++ b/drivers/serial/serial_imx.c @@ -336,6 +336,7 @@ static int imx_serial_probe(struct device_d *dev) cdev->getc = imx_serial_getc; cdev->flush = imx_serial_flush; cdev->setbrg = imx_serial_setbaudrate; + cdev->linux_console_name = "ttymxc"; imx_serial_init_port(cdev); diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c index a8487b0ed3..f1da44b7f7 100644 --- a/drivers/serial/serial_ns16550.c +++ b/drivers/serial/serial_ns16550.c @@ -57,6 +57,7 @@ static inline struct ns16550_priv *to_ns16550_priv(struct console_device *cdev) struct ns16550_drvdata { void (*init_port)(struct console_device *cdev); + const char *linux_console_name; }; /** @@ -251,6 +252,7 @@ static struct ns16550_drvdata ns16550_drvdata = { static __maybe_unused struct ns16550_drvdata omap_drvdata = { .init_port = ns16550_omap_init_port, + .linux_console_name = "ttyO", }; /** @@ -312,6 +314,7 @@ static int ns16550_probe(struct device_d *dev) cdev->putc = ns16550_putc; cdev->getc = ns16550_getc; cdev->setbrg = ns16550_setbaudrate; + cdev->linux_console_name = devtype->linux_console_name; devtype->init_port(cdev); |