diff options
| author | Tom Rini <trini@konsulko.com> | 2018-06-01 13:50:15 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-06-01 13:50:15 -0400 |
| commit | 582d97b6d37ed1bfce575c32d3847a42fc633b8e (patch) | |
| tree | d785c61500e15e1be21dbf3bd89231ff70dbfbf4 /drivers/serial/serial_zynq.c | |
| parent | caa2a2e5ab44d87faf51fafc780ecc985e0c05d6 (diff) | |
| parent | a18d09ea384fb66105fbfa24fd2d1288754b8f07 (diff) | |
Merge tag 'xilinx-for-v2018.07-2' of git://www.denx.de/git/u-boot-microblaze
Xilinx changes for v2018.07 second pull
zynqmp:
- Show reset reason
- Remove emulation platform
- Update pmufw version
- Simplify mmc bootmode
- Remove dc2 useless configuration file
- Cleanup mini config
- Defconfig syncup
- zcu100, zcu104 and zcu111 dts fixes
xilinx:
- Use live-tree functions in some drivers
- Add support for Avnet Minized and Antminer S9
fpga:
- Add secure bitstream loading support
mmc:
- Add hs200 mode support
usb xhci:
- Header fix
Diffstat (limited to 'drivers/serial/serial_zynq.c')
| -rw-r--r-- | drivers/serial/serial_zynq.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/serial/serial_zynq.c b/drivers/serial/serial_zynq.c index 06f0a48e67..3650af2157 100644 --- a/drivers/serial/serial_zynq.c +++ b/drivers/serial/serial_zynq.c @@ -175,7 +175,9 @@ static int zynq_serial_ofdata_to_platdata(struct udevice *dev) { struct zynq_uart_priv *priv = dev_get_priv(dev); - priv->regs = (struct uart_zynq *)devfdt_get_addr(dev); + priv->regs = (struct uart_zynq *)dev_read_addr(dev); + if (IS_ERR(priv->regs)) + return PTR_ERR(priv->regs); return 0; } |