summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2012-09-14 22:38:09 +0200
committerTom Rini <trini@ti.com>2012-10-15 11:53:56 -0700
commit0dd9b84908469332c655361682507ad05736b4dc (patch)
tree25b94fed059bd9cb34e48162fa4c841f680b4b78 /common
parenta943472c23d8ff71888aed033cc8b51c7bfb282a (diff)
downloadtalos-obmc-uboot-0dd9b84908469332c655361682507ad05736b4dc.tar.gz
talos-obmc-uboot-0dd9b84908469332c655361682507ad05736b4dc.zip
serial: arm: Implement CONFIG_SERIAL_MULTI into netarm serial driver
Implement support for CONFIG_SERIAL_MULTI into netarm 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 netarm 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: Stefano Babic <sbabic@denx.de>
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 1ac8625fa5..0c0712bc41 100644
--- a/common/serial.c
+++ b/common/serial.c
@@ -88,6 +88,7 @@ serial_initfunc(lh7a40x_serial_initialize);
serial_initfunc(lpc2292_serial_initialize);
serial_initfunc(max3100_serial_initialize);
serial_initfunc(mxc_serial_initialize);
+serial_initfunc(netarm_serial_initialize);
void serial_register(struct serial_device *dev)
{
@@ -154,6 +155,7 @@ void serial_initialize(void)
lpc2292_serial_initialize();
max3100_serial_initialize();
mxc_serial_initialize();
+ netarm_serial_initialize();
serial_assign(default_serial_console()->name);
}
OpenPOWER on IntegriCloud