#include <linux/types.h>
-#ifdef CONFIG_DM_SERIAL
+#if defined(CONFIG_DM_SERIAL) && !defined(CONFIG_SYS_NS16550_REG_SIZE)
/*
* For driver model we always use one byte per register, and sort out the
* differences in the driver
/* useful defaults for LCR */
#define UART_LCR_8N1 0x03
-void NS16550_init(struct ns16550 *com_port, int baud_divisor);
-void NS16550_putc(struct ns16550 *com_port, char c);
-char NS16550_getc(struct ns16550 *com_port);
-int NS16550_tstc(struct ns16550 *com_port);
-void NS16550_reinit(struct ns16550 *com_port, int baud_divisor);
+void ns16550_init(struct ns16550 *com_port, int baud_divisor);
+void ns16550_putc(struct ns16550 *com_port, char c);
+char ns16550_getc(struct ns16550 *com_port);
+int ns16550_tstc(struct ns16550 *com_port);
+void ns16550_reinit(struct ns16550 *com_port, int baud_divisor);
/**
* ns16550_calc_divisor() - calculate the divisor given clock and baud rate
* @port: UART port
* @clock: UART input clock speed in Hz
* @baudrate: Required baud rate
- * @return baud rate divisor that should be used
+ * Return: baud rate divisor that should be used
*/
int ns16550_calc_divisor(struct ns16550 *port, int clock, int baudrate);
* ns16550_serial_probe() - probe a serial port
*
* This sets up the serial port ready for use, except for the baud rate
- * @return 0, or -ve on error
+ * Return: 0, or -ve on error
*/
int ns16550_serial_probe(struct udevice *dev);