summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2012-09-13 16:50:30 +0200
committerTom Rini <trini@ti.com>2012-10-15 11:53:54 -0700
commitcfba4573f6cc2a888ae7ceab6bba3c3dab04f3dd (patch)
tree680076dc220ed1731d08552118c9cfc4d44fb05b /common
parentb207d6455b123b08ad8d2d29dec76c6cd6fee87a (diff)
serial: arm: Implement CONFIG_SERIAL_MULTI into atmel serial driver
Implement support for CONFIG_SERIAL_MULTI into atmel 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 atmel 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: Xu, Hong <Hong.Xu@atmel.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 71985fd00d..7b2030639f 100644
--- a/common/serial.c
+++ b/common/serial.c
@@ -72,6 +72,7 @@ serial_initfunc(sconsole_serial_initialize);
serial_initfunc(p3mx_serial_initialize);
serial_initfunc(altera_jtag_serial_initialize);
serial_initfunc(altera_serial_initialize);
+serial_initfunc(atmel_serial_initialize);
void serial_register(struct serial_device *dev)
{
@@ -122,6 +123,7 @@ void serial_initialize(void)
p3mx_serial_initialize();
altera_jtag_serial_initialize();
altera_serial_initialize();
+ atmel_serial_initialize();
serial_assign(default_serial_console()->name);
}