diff options
| author | Tom Rini <trini@konsulko.com> | 2018-03-25 12:00:00 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-03-25 12:00:00 -0400 |
| commit | 89a650e0ffb89faaea1b9e6ad8cf2b38203435f2 (patch) | |
| tree | 4827f512e3c1e6f2887133bbb9cb3ee9497ba603 /drivers/clk/clk_zynq.c | |
| parent | 423effc04a195ce6a464eadadfa7f765bf786889 (diff) | |
| parent | 8ae3d0b50cd22aebcd87022dc357d1cf0f3a879b (diff) | |
Merge tag 'xilinx-for-v2018.05' of git://git.denx.de/u-boot-microblaze
Xilinx changes for v2018.05
- Fix mkimage recognition
- Update all my fragments
ZynqMP:
- Use clk driver
- Support loading elfs in el1
- Various DTS and defconfig changes
- Enable newer pmufw versions
- Support more clocks
- Remove ep108
- Secure image support
- Fix memtest setup
Zynq:
- Enabling watchdog driver
- Support more clocks
- defconfig changes
fpga:
- Simplify error path
net:
- GMII case update
Diffstat (limited to 'drivers/clk/clk_zynq.c')
| -rw-r--r-- | drivers/clk/clk_zynq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/clk_zynq.c b/drivers/clk/clk_zynq.c index 50f2a65c20..3845e07309 100644 --- a/drivers/clk/clk_zynq.c +++ b/drivers/clk/clk_zynq.c @@ -394,7 +394,7 @@ static ulong zynq_clk_get_rate(struct clk *clk) return zynq_clk_get_peripheral_rate(priv, id, two_divs); case dma_clk: return zynq_clk_get_cpu_rate(priv, cpu_2x_clk); - case usb0_aper_clk ... smc_aper_clk: + case usb0_aper_clk ... swdt_clk: return zynq_clk_get_cpu_rate(priv, cpu_1x_clk); default: return -ENXIO; |