X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fns16550.h;h=5fcbcd2e74e3a2965eda64905416f1f2b792d4bc;hb=49aefe300a6f52e49eeb66c9edbc45b688518fdd;hp=0607379537d7ccf1038a0d322fdf29d95fbc0df4;hpb=5aa7bece1045c28806ce919099616ebe8fa63325;p=oweals%2Fu-boot.git

diff --git a/include/ns16550.h b/include/ns16550.h
index 0607379537..5fcbcd2e74 100644
--- a/include/ns16550.h
+++ b/include/ns16550.h
@@ -33,7 +33,7 @@
 
 #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)
+#elif defined(CONFIG_SYS_NS16550_MEM32) && !defined(CONFIG_DM_SERIAL)
 #define UART_REG(x) u32 x
 #elif (CONFIG_SYS_NS16550_REG_SIZE > 0)
 #define UART_REG(x)						   \
@@ -56,6 +56,8 @@ struct ns16550_platdata {
 	unsigned long base;
 	int reg_shift;
 	int clock;
+	int reg_offset;
+	u32 fcr;
 };
 
 struct udevice;
@@ -116,6 +118,14 @@ typedef struct NS16550 *NS16550_t;
 #define UART_FCR_RXSR		0x02 /* Receiver soft reset */
 #define UART_FCR_TXSR		0x04 /* Transmitter soft reset */
 
+/* Ingenic JZ47xx specific UART-enable bit. */
+#define UART_FCR_UME		0x10
+
+/* Clear & enable FIFOs */
+#define UART_FCR_DEFVAL (UART_FCR_FIFO_EN | \
+			UART_FCR_RXSR |	\
+			UART_FCR_TXSR)
+
 /*
  * These are the definitions for the Modem Control Register
  */