diff options
| author | Tom Rini <trini@konsulko.com> | 2017-03-16 20:44:23 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-03-16 20:44:23 (GMT) |
| commit | b504ff9f6bbdd4d3700595f64f3c30c5c9f70d35 (patch) | |
| tree | 1fc53c2ec5242469cceb80a059b3ce8f55bf5b4d /drivers/serial | |
| parent | ce38ebb6f7f0e2111b7d457651ae0a76bc5a2636 (diff) | |
| parent | 61e745d1311532a90de537cc470da12d306ee193 (diff) | |
| download | u-boot-fsl-qoriq-b504ff9f6bbdd4d3700595f64f3c30c5c9f70d35.tar.xz | |
Merge tag 'xilinx-for-v2017.05' of git://www.denx.de/git/u-boot-microblaze
Xilinx changes for v2017.05
- Move to DM clk driver
- Add clk support for zynq_sdhci
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/serial_zynq.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/serial/serial_zynq.c b/drivers/serial/serial_zynq.c index 4f6e7e4..a2967c0 100644 --- a/drivers/serial/serial_zynq.c +++ b/drivers/serial/serial_zynq.c @@ -15,7 +15,6 @@ #include <asm/io.h> #include <linux/compiler.h> #include <serial.h> -#include <asm/arch/clk.h> #include <asm/arch/hardware.h> DECLARE_GLOBAL_DATA_PTR; @@ -111,7 +110,6 @@ int zynq_serial_setbrg(struct udevice *dev, int baudrate) struct zynq_uart_priv *priv = dev_get_priv(dev); unsigned long clock; -#if defined(CONFIG_CLK) || defined(CONFIG_SPL_CLK) int ret; struct clk clk; @@ -133,9 +131,7 @@ int zynq_serial_setbrg(struct udevice *dev, int baudrate) dev_err(dev, "failed to enable clock\n"); return ret; } -#else - clock = get_uart_clk(0); -#endif + _uart_zynq_serial_setbrg(priv->regs, clock, baudrate); return 0; |