diff options
| author | Tom Rini <[email protected]> | 2020-03-31 17:24:19 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-03-31 17:24:19 -0400 |
| commit | 2b18b89156335bf1f0d84f81d3597762bc48c61d (patch) | |
| tree | 544e93c39bfaeff20b2ac47980de27edf1a585e4 /drivers/serial | |
| parent | 779e6dc6a429ac28dfd4f07ab0c3648a31399d4a (diff) | |
| parent | ac28e59a574dd231a4787752d923f618587e3d10 (diff) | |
Merge branch 'next' of git://git.denx.de/u-boot-usb into next
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/Makefile | 2 | ||||
| -rw-r--r-- | drivers/serial/serial_mcf.c (renamed from drivers/serial/mcfuart.c) | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index e26b64494e5..e4a92bbbb71 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -39,7 +39,7 @@ obj-$(CONFIG_COREBOOT_SERIAL) += serial_coreboot.o obj-$(CONFIG_CORTINA_UART) += serial_cortina.o obj-$(CONFIG_EFI_APP) += serial_efi.o obj-$(CONFIG_LPC32XX_HSUART) += lpc32xx_hsuart.o -obj-$(CONFIG_MCFUART) += mcfuart.o +obj-$(CONFIG_MCFUART) += serial_mcf.o obj-$(CONFIG_SYS_NS16550) += ns16550.o obj-$(CONFIG_S5P) += serial_s5p.o obj-$(CONFIG_MXC_UART) += serial_mxc.o diff --git a/drivers/serial/mcfuart.c b/drivers/serial/serial_mcf.c index 066e5a18d88..b599064b488 100644 --- a/drivers/serial/mcfuart.c +++ b/drivers/serial/serial_mcf.c @@ -85,6 +85,8 @@ static int coldfire_serial_probe(struct udevice *dev) { struct coldfire_serial_platdata *plat = dev->platdata; + plat->port = dev->seq; + return mcf_serial_init_common((uart_t *)plat->base, plat->port, plat->baudrate); } @@ -148,8 +150,6 @@ static int coldfire_ofdata_to_platdata(struct udevice *dev) return -ENODEV; plat->base = (uint32_t)addr_base; - - plat->port = dev->seq; plat->baudrate = gd->baudrate; return 0; |