summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2012-09-14 22:39:44 +0200
committerTom Rini <trini@ti.com>2012-10-15 11:53:57 -0700
commita30a4220849093610a3f6d4ce51f8ae11516c305 (patch)
tree1e6b68e423ff9c809b635af767ad6b3fe371b740 /common
parenteb5076697ad1f860db2064b2ccaed3c3c9d555d9 (diff)
downloadtalos-obmc-uboot-a30a4220849093610a3f6d4ce51f8ae11516c305.tar.gz
talos-obmc-uboot-a30a4220849093610a3f6d4ce51f8ae11516c305.zip
serial: arm: Implement CONFIG_SERIAL_MULTI into sa1100 serial driver
Implement support for CONFIG_SERIAL_MULTI into sa1100 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 sa1100 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>
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 d60e6d2750..a3826dee72 100644
--- a/common/serial.c
+++ b/common/serial.c
@@ -91,6 +91,7 @@ serial_initfunc(mxc_serial_initialize);
serial_initfunc(netarm_serial_initialize);
serial_initfunc(pl01x_serial_initialize);
serial_initfunc(s3c44b0_serial_initialize);
+serial_initfunc(sa1100_serial_initialize);
void serial_register(struct serial_device *dev)
{
@@ -160,6 +161,7 @@ void serial_initialize(void)
netarm_serial_initialize();
pl01x_serial_initialize();
s3c44b0_serial_initialize();
+ sa1100_serial_initialize();
serial_assign(default_serial_console()->name);
}
OpenPOWER on IntegriCloud