projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mimc200' into next
[oweals/u-boot.git]
/
drivers
/
serial
/
ns16550.c
diff --git
a/drivers/serial/ns16550.c
b/drivers/serial/ns16550.c
index 93c2243d7d7badabfd8cd896a3b7232640ac639f..397f5df5d60b81139852037c35c9464ba6bece27 100644
(file)
--- a/
drivers/serial/ns16550.c
+++ b/
drivers/serial/ns16550.c
@@
-5,9
+5,6
@@
*/
#include <config.h>
*/
#include <config.h>
-
-#ifdef CONFIG_SYS_NS16550
-
#include <ns16550.h>
#define LCRVAL LCR_8N1 /* 8 data, 1 stop, no parity */
#include <ns16550.h>
#define LCRVAL LCR_8N1 /* 8 data, 1 stop, no parity */
@@
-36,9
+33,10
@@
void NS16550_init (NS16550_t com_port, int baud_divisor)
#else
com_port->mdr1 = 0; /* /16 is proper to hit 115200 with 48MHz */
#endif
#else
com_port->mdr1 = 0; /* /16 is proper to hit 115200 with 48MHz */
#endif
-#endif
+#endif
/* CONFIG_OMAP */
}
}
+#ifndef CONFIG_NS16550_MIN_FUNCTIONS
void NS16550_reinit (NS16550_t com_port, int baud_divisor)
{
com_port->ier = 0x00;
void NS16550_reinit (NS16550_t com_port, int baud_divisor)
{
com_port->ier = 0x00;
@@
-53,6
+51,7
@@
void NS16550_reinit (NS16550_t com_port, int baud_divisor)
com_port->dlm = (baud_divisor >> 8) & 0xff;
com_port->lcr = LCRVAL;
}
com_port->dlm = (baud_divisor >> 8) & 0xff;
com_port->lcr = LCRVAL;
}
+#endif /* CONFIG_NS16550_MIN_FUNCTIONS */
void NS16550_putc (NS16550_t com_port, char c)
{
void NS16550_putc (NS16550_t com_port, char c)
{
@@
-60,6
+59,7
@@
void NS16550_putc (NS16550_t com_port, char c)
com_port->thr = c;
}
com_port->thr = c;
}
+#ifndef CONFIG_NS16550_MIN_FUNCTIONS
char NS16550_getc (NS16550_t com_port)
{
while ((com_port->lsr & LSR_DR) == 0) {
char NS16550_getc (NS16550_t com_port)
{
while ((com_port->lsr & LSR_DR) == 0) {
@@
-76,4
+76,4
@@
int NS16550_tstc (NS16550_t com_port)
return ((com_port->lsr & LSR_DR) != 0);
}
return ((com_port->lsr & LSR_DR) != 0);
}
-#endif
+#endif
/* CONFIG_NS16550_MIN_FUNCTIONS */