summaryrefslogtreecommitdiff
path: root/drivers/serial/ns16550.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-07-04 11:58:23 -0600
committerSimon Glass <sjg@chromium.org>2016-07-14 20:40:24 -0600
commitb2927fbaa89d2c7f7ac3977bc0cab2a4b7924acd (patch)
tree88a0b731a3ef2ff11e9c3a4b1199b4e793df53e8 /drivers/serial/ns16550.c
parent1e6ca1a6ad7285569b22465b8387db242b310553 (diff)
downloadu-boot-imx-b2927fbaa89d2c7f7ac3977bc0cab2a4b7924acd.zip
u-boot-imx-b2927fbaa89d2c7f7ac3977bc0cab2a4b7924acd.tar.gz
u-boot-imx-b2927fbaa89d2c7f7ac3977bc0cab2a4b7924acd.tar.bz2
dm: serial: ns16550: Update to support of-platdata
With of-platdata this driver cannot know the format of the of-platdata struct, so we cannot use generic code for accessing the of-platdata. Each SoC that uses this driver will need to set up ns16550's platdata for it. So don't compile in the generic code. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/serial/ns16550.c')
-rw-r--r--drivers/serial/ns16550.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index c6cb3eb..88fca15 100644
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -347,7 +347,7 @@ int ns16550_serial_probe(struct udevice *dev)
return 0;
}
-#if CONFIG_IS_ENABLED(OF_CONTROL)
+#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
int ns16550_serial_ofdata_to_platdata(struct udevice *dev)
{
struct ns16550_platdata *plat = dev->platdata;
@@ -416,6 +416,7 @@ const struct dm_serial_ops ns16550_serial_ops = {
.setbrg = ns16550_serial_setbrg,
};
+#if !CONFIG_IS_ENABLED(OF_PLATDATA)
#if CONFIG_IS_ENABLED(OF_CONTROL)
/*
* Please consider existing compatible strings before adding a new
@@ -452,4 +453,5 @@ U_BOOT_DRIVER(ns16550_serial) = {
.flags = DM_FLAG_PRE_RELOC,
};
#endif
+#endif /* !OF_PLATDATA */
#endif /* CONFIG_DM_SERIAL */