summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2012-09-13 16:49:51 +0200
committerTom Rini <trini@ti.com>2012-10-15 11:53:54 -0700
commitb207d6455b123b08ad8d2d29dec76c6cd6fee87a (patch)
tree0a50f865d6447412d96b60c72cfcbfe0c92d250a /common
parent8c085757498281aed461979518401179d3e9942f (diff)
serial: arm: Implement CONFIG_SERIAL_MULTI into altera serial driver
Implement support for CONFIG_SERIAL_MULTI into altera serial driver. This driver was so far only usable directly, but this patch also adds support for the multi method. This allows using more than one serial driver alongside the altera driver. Also, add a weak implementation of default_serial_console() returning this driver. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Marek Vasut <marek.vasut@gmail.com> Cc: Tom Rini <trini@ti.com> Cc: Scott McNutt <smcnutt@psyent.com>
Diffstat (limited to 'common')
-rw-r--r--common/serial.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/common/serial.c b/common/serial.c
index 65d9e84eb3..71985fd00d 100644
--- a/common/serial.c
+++ b/common/serial.c
@@ -71,6 +71,7 @@ serial_initfunc(ml2_serial_initialize);
serial_initfunc(sconsole_serial_initialize);
serial_initfunc(p3mx_serial_initialize);
serial_initfunc(altera_jtag_serial_initialize);
+serial_initfunc(altera_serial_initialize);
void serial_register(struct serial_device *dev)
{
@@ -120,6 +121,7 @@ void serial_initialize(void)
sconsole_serial_initialize();
p3mx_serial_initialize();
altera_jtag_serial_initialize();
+ altera_serial_initialize();
serial_assign(default_serial_console()->name);
}