summaryrefslogtreecommitdiff
path: root/drivers/serial/ns16550.c
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-06-10 18:28:37 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-06-10 18:28:37 +0200
commit1b83470f3c2eeae398cf90831f96c8ba4ed675fa (patch)
tree39bcf8beb8722bfe9cacbb3310cd5571f1e0b720 /drivers/serial/ns16550.c
parent74ae612fd8cfeb55f663bdd565d3f9d73703b2c4 (diff)
parent68cd4a4c9f4d7be8dc95796fb567f6b03faf9d97 (diff)
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'drivers/serial/ns16550.c')
-rw-r--r--drivers/serial/ns16550.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index 7f013ab33c..d77c25fa9b 100644
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -74,13 +74,8 @@ void NS16550_init(NS16550_t com_port, int baud_divisor)
defined(CONFIG_AM33XX) || defined(CONFIG_SOC_DA8XX) || \
defined(CONFIG_TI814X)
-#if defined(CONFIG_APTIX)
- /* /13 mode so Aptix 6MHz can hit 115200 */
- serial_out(3, &com_port->mdr1);
-#else
/* /16 is proper to hit 115200 with 48MHz */
serial_out(0, &com_port->mdr1);
-#endif
#endif /* CONFIG_OMAP */
}