diff options
| author | Tom Rini <trini@konsulko.com> | 2019-09-14 19:53:24 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-09-14 19:53:24 -0400 |
| commit | 23b93e33adde0a8313388eda7c78d1d0786e3c92 (patch) | |
| tree | 4e1738af9c78f4ce0ff7e22f696d6602b9c1db4f /drivers | |
| parent | 87d5b225585f341ea8e926a2c26fb72585fc9d0c (diff) | |
| parent | 1852b44cefe6b5c465898d82366081f22d783330 (diff) | |
| download | u-boot-23b93e33adde0a8313388eda7c78d1d0786e3c92.tar.gz | |
Merge branch '2019-09-13-ti-imports'
- Assorted K3 bugfixes.
- Assorted DM enablements, dead code removal.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/soc/ti/k3-navss-ringacc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/soc/ti/k3-navss-ringacc.c b/drivers/soc/ti/k3-navss-ringacc.c index fcb84f7aa4..64ebc0ba00 100644 --- a/drivers/soc/ti/k3-navss-ringacc.c +++ b/drivers/soc/ti/k3-navss-ringacc.c @@ -366,8 +366,10 @@ void k3_nav_ringacc_ring_reset_dma(struct k3_nav_ring *ring, u32 occ) if (!ring || !(ring->flags & KNAV_RING_FLAG_BUSY)) return; - if (!ring->parent->dma_ring_reset_quirk) + if (!ring->parent->dma_ring_reset_quirk) { + k3_nav_ringacc_ring_reset(ring); return; + } if (!occ) occ = ringacc_readl(&ring->rt->occ); |