summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2012-09-14 22:35:14 +0200
committerTom Rini <trini@ti.com>2012-10-15 11:53:56 -0700
commitb6cd0fef93b84c3238edeafc95134dbcabb838ca (patch)
tree2310e713a22e028f8757f5bdbd43eeb73522ef5f /common
parent7882e7c18297ae1d00fd4068cabd80d3c5762453 (diff)
downloadtalos-obmc-uboot-b6cd0fef93b84c3238edeafc95134dbcabb838ca.tar.gz
talos-obmc-uboot-b6cd0fef93b84c3238edeafc95134dbcabb838ca.zip
serial: arm: Implement CONFIG_SERIAL_MULTI into ixp serial driver
Implement support for CONFIG_SERIAL_MULTI into ixp 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 ixp 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: Michael Schwingen <michael@schwingen.org>
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 17a3790c1e..269709d6b7 100644
--- a/common/serial.c
+++ b/common/serial.c
@@ -82,6 +82,7 @@ serial_initfunc(s3c64xx_serial_initialize);
serial_initfunc(sandbox_serial_initialize);
serial_initfunc(clps7111_serial_initialize);
serial_initfunc(imx_serial_initialize);
+serial_initfunc(ixp_serial_initialize);
void serial_register(struct serial_device *dev)
{
@@ -142,6 +143,7 @@ void serial_initialize(void)
sandbox_serial_initialize();
clps7111_serial_initialize();
imx_serial_initialize();
+ ixp_serial_initialize();
serial_assign(default_serial_console()->name);
}
OpenPOWER on IntegriCloud