diff options
| author | Tom Rini <trini@konsulko.com> | 2022-11-22 12:33:48 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-11-22 12:33:48 -0500 |
| commit | 521277ec15eb794229403ec24b8c00a4ff02b0b6 (patch) | |
| tree | 7eb2da32590f4c48bc9e2ef8cde5ae85c3d9e7bf /drivers/timer/xilinx-timer.c | |
| parent | 536c642ffef545b4b5b02d065a0c1de9785549d7 (diff) | |
| parent | 3655dd22a4c219d0ee69dc4a29e5553c1a1bb5d7 (diff) | |
Merge tag 'xilinx-for-v2023.01-rc3' of https://source.denx.de/u-boot/custodians/u-boot-microblaze
Xilinx changes for v2023.01-rc3
microblaze:
- Enable 32 bit addressing mode for SPIs
zynq:
- Minor DT fixes (PL clock enabling)
zynqmp:
- Disable watchdog by default
- Remove unused xlnx,eeprom chosen support
- Add missing symlink for vck190 SC revB
- Use mdio bus with ethernet-phy-id description
versal:
- Add mini qspi/ospi configuration
versal-net:
- Add soc driver
- Fix Kconfig entry for SOC
- Fix loading address location for MINI configuration
- Disable LMB for mini configuration
net:
- Fix ethernet-phy-id usage in the code
pinctrl:
- Revert high impedance/output enable support
timer:
- Fix timer relocation for Microblaze
- Fix timer wrap in 32bit Xilinx timer driver
Diffstat (limited to 'drivers/timer/xilinx-timer.c')
| -rw-r--r-- | drivers/timer/xilinx-timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/timer/xilinx-timer.c b/drivers/timer/xilinx-timer.c index 75b4473b639..172fd9f9296 100644 --- a/drivers/timer/xilinx-timer.c +++ b/drivers/timer/xilinx-timer.c @@ -40,7 +40,7 @@ static u64 xilinx_timer_get_count(struct udevice *dev) regmap_read(priv->regs, TIMER_COUNTER_OFFSET, &value); - return value; + return timer_conv_64(value); } static int xilinx_timer_probe(struct udevice *dev) |