X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fns16550.h;h=4e620676c453c6a4e0df04332befc0a1b34da592;hb=8a36287a019f5d7532a8a1a7da6aa96e490dbb8a;hp=5784cfd97b859407c9b32fc3c4246e0674c742fd;hpb=2a8c9c86b92a9ccee3c27286de317e19bb0530b3;p=oweals%2Fu-boot.git

diff --git a/include/ns16550.h b/include/ns16550.h
index 5784cfd97b..4e620676c4 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)						   \
@@ -53,7 +53,7 @@
  * @clock:		UART base clock speed in Hz
  */
 struct ns16550_platdata {
-	unsigned char *base;
+	unsigned long base;
 	int reg_shift;
 	int clock;
 };