diff options
author | Tom Rini <trini@konsulko.com> | 2020-10-12 07:26:57 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-10-12 07:26:57 -0400 |
commit | 47e9c70421d75336336097c1425028b40e4f0b54 (patch) | |
tree | b8ee7f6b2c0e6bfe39511f64dec25fad3b28de0b /drivers/dma | |
parent | 726561a9412abe50875b7791feab94f411d76199 (diff) | |
parent | 555ee3949307648d6c40081b30e212af075ab8a8 (diff) | |
download | u-boot-47e9c70421d75336336097c1425028b40e4f0b54.zip u-boot-47e9c70421d75336336097c1425028b40e4f0b54.tar.gz u-boot-47e9c70421d75336336097c1425028b40e4f0b54.tar.bz2 |
Merge tag 'ti-v2021.01-rc1' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti
- Minor cleanup on K3 env variables
- Fix OSPI compatible for J721e
- Drop unused property in omap-usb2-phy
- Update Maintainer for am335x-guardian board.
Diffstat (limited to 'drivers/dma')
-rw-r--r-- | drivers/dma/ti/k3-udma.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c index 57d9fbf..9421604 100644 --- a/drivers/dma/ti/k3-udma.c +++ b/drivers/dma/ti/k3-udma.c @@ -1134,7 +1134,9 @@ err_free_res: static void udma_free_chan_resources(struct udma_chan *uc) { - /* Some configuration to UDMA-P channel: disable, reset, whatever */ + /* Hard reset UDMA channel */ + udma_stop_hard(uc); + udma_reset_counters(uc); /* Release PSI-L pairing */ udma_navss_psil_unpair(uc->ud, uc->config.src_thread, uc->config.dst_thread); |