Merge branch 'master' of git://git.denx.de/u-boot-nds32

[karo-tx-uboot.git] / include / ns16550.h

diff --git a/include/ns16550.h b/include/ns16550.h
index ce606b5738396651e758c662aa9a3e5a8fcd0ba1..51cb5b4a66d86029674feca1cdf395d493ec56ae 100644 (file)
--- a/include/ns16550.h
+++ b/include/ns16550.h
@@ -1,6 +1,6 @@
 /*
  * NS16550 Serial Port
- * originally from linux source (arch/ppc/boot/ns16550.h)
+ * originally from linux source (arch/powerpc/boot/ns16550.h)
  *
  * Cleanup and unification
  * (C) 2009 by Detlev Zundel, DENX Software Engineering GmbH
@@ -21,8 +21,12 @@
  * will not allocate storage for arrays of size 0
  */
 
+#include <linux/types.h>
+
 #if !defined(CONFIG_SYS_NS16550_REG_SIZE) || (CONFIG_SYS_NS16550_REG_SIZE == 0)
 #error "Please define NS16550 registers size."
+#elif defined(CONFIG_SYS_NS16550_MEM32)
+#define UART_REG(x) u32 x
 #elif (CONFIG_SYS_NS16550_REG_SIZE > 0)
 #define UART_REG(x)                                               \
        unsigned char prepad_##x[CONFIG_SYS_NS16550_REG_SIZE - 1]; \
@@ -42,6 +46,14 @@ struct NS16550 {
        UART_REG(lsr);          /* 5 */
        UART_REG(msr);          /* 6 */
        UART_REG(spr);          /* 7 */
+#ifdef CONFIG_SOC_DA8XX
+       UART_REG(reg8);         /* 8 */
+       UART_REG(reg9);         /* 9 */
+       UART_REG(revid1);       /* A */
+       UART_REG(revid2);       /* B */
+       UART_REG(pwr_mgmt);     /* C */
+       UART_REG(mdr1);         /* D */
+#else
        UART_REG(mdr1);         /* 8 */
        UART_REG(reg9);         /* 9 */
        UART_REG(regA);         /* A */
@@ -54,6 +66,7 @@ struct NS16550 {
        UART_REG(ssr);          /* 11*/
        UART_REG(reg12);        /* 12*/
        UART_REG(osc_12m_sel);  /* 13*/
+#endif
 };
 
 #define thr rbr
@@ -61,12 +74,12 @@ struct NS16550 {
 #define dll rbr
 #define dlm ier
 
-typedef volatile struct NS16550 *NS16550_t;
+typedef struct NS16550 *NS16550_t;
 
 /*
  * These are the definitions for the FIFO Control Register
  */
-#define UART_FCR_FIFO_EN       0x01 /* Fifo enable */
+#define UART_FCR_FIFO_EN       0x01 /* Fifo enable */
 #define UART_FCR_CLEAR_RCVR    0x02 /* Clear the RCVR FIFO */
 #define UART_FCR_CLEAR_XMIT    0x04 /* Clear the XMIT FIFO */
 #define UART_FCR_DMA_SELECT    0x08 /* For DMA applications */
@@ -102,7 +115,7 @@ typedef volatile struct NS16550 *NS16550_t;
 #define UART_LCR_WLS_6 0x01            /* 6 bit character length */
 #define UART_LCR_WLS_7 0x02            /* 7 bit character length */
 #define UART_LCR_WLS_8 0x03            /* 8 bit character length */
-#define UART_LCR_STB   0x04            /* Number of stop Bits, off = 1, on = 1.5 or 2) */
+#define UART_LCR_STB   0x04            /* # stop Bits, off=1, on=1.5 or 2) */
 #define UART_LCR_PEN   0x08            /* Parity eneble */
 #define UART_LCR_EPS   0x10            /* Even Parity Select */
 #define UART_LCR_STKP  0x20            /* Stick Parity */
@@ -158,8 +171,8 @@ typedef volatile struct NS16550 *NS16550_t;
 /* useful defaults for LCR */
 #define UART_LCR_8N1   0x03
 
-void   NS16550_init   (NS16550_t com_port, int baud_divisor);
-void   NS16550_putc   (NS16550_t com_port, char c);
-char   NS16550_getc   (NS16550_t com_port);
-int    NS16550_tstc   (NS16550_t com_port);
-void   NS16550_reinit (NS16550_t com_port, int baud_divisor);
+void NS16550_init(NS16550_t com_port, int baud_divisor);
+void NS16550_putc(NS16550_t com_port, char c);
+char NS16550_getc(NS16550_t com_port);
+int NS16550_tstc(NS16550_t com_port);
+void NS16550_reinit(NS16550_t com_port, int baud_divisor);