| Message ID | 1411400934-7754-13-git-send-email-sjg@chromium.org |
|---|---|
| State | Superseded |
| Delegated to: | Simon Glass |
| Headers | show |
Hi Simon, One minor comment from me. On Mon, 22 Sep 2014 09:48:52 -0600 Simon Glass <sjg@chromium.org> wrote: > + > +U_BOOT_DRIVER(serial_omap_ns16550) = { > + .name = "serial_omap", > + .id = UCLASS_SERIAL, > +#ifdef CONFIG_OF_CONTROL > + .of_match = omap_serial_ids, > + .ofdata_to_platdata = omap_serial_ofdata_to_platdata, > +#endif > + .platdata_auto_alloc_size = sizeof(struct ns16550_platdata), > + .priv_auto_alloc_size = sizeof(struct NS16550), > + .probe = ns16550_serial_probe, > + .ops = &ns16550_serial_ops, > + .flags = DM_FLAG_PRE_RELOC, > +}; U_BOOT_DRIVER(serial_omap_ns16550) = { .name = "serial_omap", .id = UCLASS_SERIAL, .of_match = of_match_ptr(omap_serial_ids), .ofdata_to_platdata = of_match_ptr(omap_serial_ofdata_to_platdata), .platdata_auto_alloc_size = sizeof(struct ns16550_platdata), .priv_auto_alloc_size = sizeof(struct NS16550), .probe = ns16550_serial_probe, .ops = &ns16550_serial_ops, .flags = DM_FLAG_PRE_RELOC, }; is cleaner though you need to apply the following first: http://patchwork.ozlabs.org/patch/397088/ Best Regards Masahiro Yamada
On Mon, Sep 22, 2014 at 09:48:52AM -0600, Simon Glass wrote: > Add driver model support to this driver, while retaining support for the > legacy system. Driver model serial support is enabled with CONFIG_DM_SERIAL > as usual. > > Signed-off-by: Simon Glass <sjg@chromium.org> Assuming you'll make the change Masahiro pointed out, Reviewed-by: Tom Rini <trini@ti.com>
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index 853a8c6..9ac3496 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -39,6 +39,7 @@ obj-$(CONFIG_FSL_LPUART) += serial_lpuart.o obj-$(CONFIG_MXS_AUART) += mxs_auart.o obj-$(CONFIG_ARC_SERIAL) += serial_arc.o obj-$(CONFIG_TEGRA_SERIAL) += serial_tegra.o +obj-$(CONFIG_OMAP_SERIAL) += serial_omap.o ifndef CONFIG_SPL_BUILD obj-$(CONFIG_USB_TTY) += usbtty.o diff --git a/drivers/serial/serial_omap.c b/drivers/serial/serial_omap.c new file mode 100644 index 0000000..6866b21 --- /dev/null +++ b/drivers/serial/serial_omap.c @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2014 Google, Inc + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <dm.h> +#include <fdtdec.h> +#include <ns16550.h> +#include <serial.h> + +DECLARE_GLOBAL_DATA_PTR; + +#ifdef CONFIG_OF_CONTROL +static const struct udevice_id omap_serial_ids[] = { + { .compatible = "ti,omap3-uart" }, + { } +}; + +static int omap_serial_ofdata_to_platdata(struct udevice *dev) +{ + struct ns16550_platdata *plat = dev_get_platdata(dev); + int ret; + + ret = ns16550_serial_ofdata_to_platdata(dev); + if (ret) + return ret; + plat->clock = fdtdec_get_int(gd->fdt_blob, dev->of_offset, + "clock-frequency", -1); + plat->reg_shift = 2; + + return 0; +} +#endif + +U_BOOT_DRIVER(serial_omap_ns16550) = { + .name = "serial_omap", + .id = UCLASS_SERIAL, +#ifdef CONFIG_OF_CONTROL + .of_match = omap_serial_ids, + .ofdata_to_platdata = omap_serial_ofdata_to_platdata, +#endif + .platdata_auto_alloc_size = sizeof(struct ns16550_platdata), + .priv_auto_alloc_size = sizeof(struct NS16550), + .probe = ns16550_serial_probe, + .ops = &ns16550_serial_ops, + .flags = DM_FLAG_PRE_RELOC, +};
Add driver model support to this driver, while retaining support for the legacy system. Driver model serial support is enabled with CONFIG_DM_SERIAL as usual. Signed-off-by: Simon Glass <sjg@chromium.org> --- drivers/serial/Makefile | 1 + drivers/serial/serial_omap.c | 49 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 drivers/serial/serial_omap.c