aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2012-09-14 22:34:51 +0200
committerTom Rini <trini@ti.com>2012-10-15 11:53:55 -0700
commit7882e7c18297ae1d00fd4068cabd80d3c5762453 (patch)
treed21093c35777b4e6a9bcfbd2263182e1dd66443c /common
parent8b029db85916b1332c5f9cae024a91ddbe418b8e (diff)
serial: arm: Implement CONFIG_SERIAL_MULTI into imx serial driver
Implement support for CONFIG_SERIAL_MULTI into imx 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 imx 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 0e0e00b01..17a3790c1 100644
--- a/common/serial.c
+++ b/common/serial.c
@@ -81,6 +81,7 @@ serial_initfunc(s3c4510b_serial_initialize);
serial_initfunc(s3c64xx_serial_initialize);
serial_initfunc(sandbox_serial_initialize);
serial_initfunc(clps7111_serial_initialize);
+serial_initfunc(imx_serial_initialize);
void serial_register(struct serial_device *dev)
{
@@ -140,6 +141,7 @@ void serial_initialize(void)
s3c64xx_serial_initialize();
sandbox_serial_initialize();
clps7111_serial_initialize();
+ imx_serial_initialize();
serial_assign(default_serial_console()->name);
}