summaryrefslogtreecommitdiffstats
path: root/include/ns16550.h
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-05-12 14:55:02 -0600
committerSimon Glass <sjg@chromium.org>2015-06-10 19:26:55 -0600
commit9091400859248e2f1d04f34f37c8a30b15fc4ef7 (patch)
treea3b4aa879c2781fee332f94d619af585f393330b /include/ns16550.h
parent8d379f179a18d6e9f3d7af8873c942a6834fb780 (diff)
downloadtalos-obmc-uboot-9091400859248e2f1d04f34f37c8a30b15fc4ef7.tar.gz
talos-obmc-uboot-9091400859248e2f1d04f34f37c8a30b15fc4ef7.zip
dm: ns16550: Support CONFIG_SYS_NS16550_MEM32 with driver model
This option is used by some boards, so support it with driver model. This is really ugly - we should rewrite this driver once all users are moved to driver model. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include/ns16550.h')
-rw-r--r--include/ns16550.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/ns16550.h b/include/ns16550.h
index 0607379537..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) \
OpenPOWER on IntegriCloud