[U-Boot] [PATCH] dm: keystone: serial: Add driver model support

Add driver model support for keystone serial driver.
Signed-off-by: Lokesh Vutla lokeshvutla@ti.com --- drivers/serial/Makefile | 1 + drivers/serial/serial_keystone.c | 48 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 drivers/serial/serial_keystone.c
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index 869ea7b..1818c7c 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -25,6 +25,7 @@ obj-$(CONFIG_EFI_APP) += serial_efi.o obj-$(CONFIG_LPC32XX_HSUART) += lpc32xx_hsuart.o obj-$(CONFIG_MCFUART) += mcfuart.o obj-$(CONFIG_OPENCORES_YANU) += opencores_yanu.o +obj-$(CONFIG_KEYSTONE_SERIAL) += serial_keystone.o obj-$(CONFIG_SYS_NS16550) += ns16550.o obj-$(CONFIG_S5P) += serial_s5p.o obj-$(CONFIG_IMX_SERIAL) += serial_imx.o diff --git a/drivers/serial/serial_keystone.c b/drivers/serial/serial_keystone.c new file mode 100644 index 0000000..7b5ab6c --- /dev/null +++ b/drivers/serial/serial_keystone.c @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2015 Texas Instruments, <www.ti.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <dm.h> +#include <fdtdec.h> +#include <ns16550.h> +#include <serial.h> +#include <asm/arch/clock.h> + +DECLARE_GLOBAL_DATA_PTR; + +#if CONFIG_IS_ENABLED(OF_CONTROL) +static const struct udevice_id keystone_serial_ids[] = { + { .compatible = "ti,keystone-uart" }, + { .compatible = "ns16550a" }, + { } +}; + +static int keystone_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 = CONFIG_SYS_NS16550_CLK; + return 0; +} +#endif + +U_BOOT_DRIVER(serial_keystone_ns16550) = { + .name = "serial_keystone", + .id = UCLASS_SERIAL, +#if CONFIG_IS_ENABLED(OF_CONTROL) + .of_match = of_match_ptr(keystone_serial_ids), + .ofdata_to_platdata = of_match_ptr(keystone_serial_ofdata_to_platdata), + .platdata_auto_alloc_size = sizeof(struct ns16550_platdata), +#endif + .priv_auto_alloc_size = sizeof(struct NS16550), + .probe = ns16550_serial_probe, + .ops = &ns16550_serial_ops, + .flags = DM_FLAG_PRE_RELOC, +};

Hi Lokesh,
On 19 September 2015 at 03:17, Lokesh Vutla lokeshvutla@ti.com wrote:
Add driver model support for keystone serial driver.
Signed-off-by: Lokesh Vutla lokeshvutla@ti.com
drivers/serial/Makefile | 1 + drivers/serial/serial_keystone.c | 48 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 drivers/serial/serial_keystone.c
Acked-by: Simon Glass sjg@chromium.org
If we could use the new binding with clock-frequency in it some of these drivers could be removed.
Regards, Simon

Hi Tom,
On Saturday 19 September 2015 02:47 PM, Lokesh Vutla wrote:
Add driver model support for keystone serial driver.
I guess you missed this patch. This has to be applied for console to come up on keystone2 devices.
Thanks and regards, Lokesh
Signed-off-by: Lokesh Vutla lokeshvutla@ti.com
drivers/serial/Makefile | 1 + drivers/serial/serial_keystone.c | 48 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 drivers/serial/serial_keystone.c
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index 869ea7b..1818c7c 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -25,6 +25,7 @@ obj-$(CONFIG_EFI_APP) += serial_efi.o obj-$(CONFIG_LPC32XX_HSUART) += lpc32xx_hsuart.o obj-$(CONFIG_MCFUART) += mcfuart.o obj-$(CONFIG_OPENCORES_YANU) += opencores_yanu.o +obj-$(CONFIG_KEYSTONE_SERIAL) += serial_keystone.o obj-$(CONFIG_SYS_NS16550) += ns16550.o obj-$(CONFIG_S5P) += serial_s5p.o obj-$(CONFIG_IMX_SERIAL) += serial_imx.o diff --git a/drivers/serial/serial_keystone.c b/drivers/serial/serial_keystone.c new file mode 100644 index 0000000..7b5ab6c --- /dev/null +++ b/drivers/serial/serial_keystone.c @@ -0,0 +1,48 @@ +/*
- Copyright (c) 2015 Texas Instruments, <www.ti.com>
- SPDX-License-Identifier: GPL-2.0+
- */
+#include <common.h> +#include <dm.h> +#include <fdtdec.h> +#include <ns16550.h> +#include <serial.h> +#include <asm/arch/clock.h>
+DECLARE_GLOBAL_DATA_PTR;
+#if CONFIG_IS_ENABLED(OF_CONTROL) +static const struct udevice_id keystone_serial_ids[] = {
- { .compatible = "ti,keystone-uart" },
- { .compatible = "ns16550a" },
- { }
+};
+static int keystone_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 = CONFIG_SYS_NS16550_CLK;
- return 0;
+} +#endif
+U_BOOT_DRIVER(serial_keystone_ns16550) = {
- .name = "serial_keystone",
- .id = UCLASS_SERIAL,
+#if CONFIG_IS_ENABLED(OF_CONTROL)
- .of_match = of_match_ptr(keystone_serial_ids),
- .ofdata_to_platdata = of_match_ptr(keystone_serial_ofdata_to_platdata),
- .platdata_auto_alloc_size = sizeof(struct ns16550_platdata),
+#endif
- .priv_auto_alloc_size = sizeof(struct NS16550),
- .probe = ns16550_serial_probe,
- .ops = &ns16550_serial_ops,
- .flags = DM_FLAG_PRE_RELOC,
+};

On Fri, Oct 23, 2015 at 08:54:02AM +0530, Lokesh Vutla wrote:
Hi Tom,
On Saturday 19 September 2015 02:47 PM, Lokesh Vutla wrote:
Add driver model support for keystone serial driver.
I guess you missed this patch. This has to be applied for console to come up on keystone2 devices.
Ooops, thanks!
Applied to u-boot/master.
Thanks and regards, Lokesh
Signed-off-by: Lokesh Vutla lokeshvutla@ti.com
drivers/serial/Makefile | 1 + drivers/serial/serial_keystone.c | 48 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 drivers/serial/serial_keystone.c
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index 869ea7b..1818c7c 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -25,6 +25,7 @@ obj-$(CONFIG_EFI_APP) += serial_efi.o obj-$(CONFIG_LPC32XX_HSUART) += lpc32xx_hsuart.o obj-$(CONFIG_MCFUART) += mcfuart.o obj-$(CONFIG_OPENCORES_YANU) += opencores_yanu.o +obj-$(CONFIG_KEYSTONE_SERIAL) += serial_keystone.o obj-$(CONFIG_SYS_NS16550) += ns16550.o obj-$(CONFIG_S5P) += serial_s5p.o obj-$(CONFIG_IMX_SERIAL) += serial_imx.o diff --git a/drivers/serial/serial_keystone.c b/drivers/serial/serial_keystone.c new file mode 100644 index 0000000..7b5ab6c --- /dev/null +++ b/drivers/serial/serial_keystone.c @@ -0,0 +1,48 @@ +/*
- Copyright (c) 2015 Texas Instruments, <www.ti.com>
- SPDX-License-Identifier: GPL-2.0+
- */
+#include <common.h> +#include <dm.h> +#include <fdtdec.h> +#include <ns16550.h> +#include <serial.h> +#include <asm/arch/clock.h>
+DECLARE_GLOBAL_DATA_PTR;
+#if CONFIG_IS_ENABLED(OF_CONTROL) +static const struct udevice_id keystone_serial_ids[] = {
- { .compatible = "ti,keystone-uart" },
- { .compatible = "ns16550a" },
- { }
+};
+static int keystone_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 = CONFIG_SYS_NS16550_CLK;
- return 0;
+} +#endif
+U_BOOT_DRIVER(serial_keystone_ns16550) = {
- .name = "serial_keystone",
- .id = UCLASS_SERIAL,
+#if CONFIG_IS_ENABLED(OF_CONTROL)
- .of_match = of_match_ptr(keystone_serial_ids),
- .ofdata_to_platdata = of_match_ptr(keystone_serial_ofdata_to_platdata),
- .platdata_auto_alloc_size = sizeof(struct ns16550_platdata),
+#endif
- .priv_auto_alloc_size = sizeof(struct NS16550),
- .probe = ns16550_serial_probe,
- .ops = &ns16550_serial_ops,
- .flags = DM_FLAG_PRE_RELOC,
+};
participants (4)
-
Lokesh Vutla
-
Lokesh Vutla
-
Simon Glass
-
Tom Rini