summaryrefslogtreecommitdiff
path: root/common/serial.c
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2012-09-13 12:27:37 +0200
committerTom Rini <trini@ti.com>2012-10-15 11:53:52 -0700
commit5dee6f559f2b14f2f673be6796bb57f0b191609f (patch)
treef3abf5b100e8003dc91fa566e05be22bd0434afd /common/serial.c
parentafe4c389fb4ca9c8d8f5d37a5f647763ed318e0e (diff)
serial: powerpc: Implement CONFIG_SERIAL_MULTI into amirix serial driver
Implement support for CONFIG_SERIAL_MULTI into amirix 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 amirix 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: Anatolij Gustschin <agust@denx.de> Cc: Stefan Roese <sr@denx.de>
Diffstat (limited to 'common/serial.c')
-rw-r--r--common/serial.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/common/serial.c b/common/serial.c
index f587d7d19d..ed8bb651bb 100644
--- a/common/serial.c
+++ b/common/serial.c
@@ -62,6 +62,7 @@ serial_initfunc(iop480_serial_initialize);
serial_initfunc(leon2_serial_initialize);
serial_initfunc(leon3_serial_initialize);
serial_initfunc(marvell_serial_initialize);
+serial_initfunc(amirix_serial_initialize);
void serial_register(struct serial_device *dev)
{
@@ -102,6 +103,7 @@ void serial_initialize(void)
leon2_serial_initialize();
leon3_serial_initialize();
marvell_serial_initialize();
+ amirix_serial_initialize();
serial_assign(default_serial_console()->name);
}