diff options
| author | Tom Rini <trini@konsulko.com> | 2024-03-04 12:07:21 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-03-04 13:41:04 -0500 |
| commit | 4ce29a9a4ae3979044c67249fcb43a6c9967181c (patch) | |
| tree | 040314475691db58e413f19b682c748d46bf2276 /drivers | |
| parent | 7ebf80f8842db237566e9d7560114ea09d5d4421 (diff) | |
| parent | 7022640c10f027e6e2cff00012b3740a78f8b9bc (diff) | |
Merge branch '2024-03-04-assorted-TI-K3-updates' into next
- Merge assorted TI K3 platform / SoC updates
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dma/ti/k3-udma.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c index eea9ec96598..ef3074aa13f 100644 --- a/drivers/dma/ti/k3-udma.c +++ b/drivers/dma/ti/k3-udma.c @@ -884,10 +884,10 @@ static int udma_alloc_tx_resources(struct udma_chan *uc) return ret; tchan = uc->tchan; - if (tchan->tflow_id >= 0) + if (tchan->tflow_id > 0) ring_idx = tchan->tflow_id; else - ring_idx = ud->bchan_cnt + tchan->id; + ring_idx = tchan->id; ret = k3_nav_ringacc_request_rings_pair(ud->ringacc, ring_idx, -1, &uc->tchan->t_ring, @@ -1770,9 +1770,11 @@ static int udma_probe(struct udevice *dev) return PTR_ERR(ud->ringacc); ud->dev = dev; - ud->ch_count = setup_resources(ud); - if (ud->ch_count <= 0) - return ud->ch_count; + ret = setup_resources(ud); + if (ret < 0) + return ret; + + ud->ch_count = ret; for (i = 0; i < ud->bchan_cnt; i++) { struct udma_bchan *bchan = &ud->bchans[i]; @@ -1831,7 +1833,7 @@ static int udma_probe(struct udevice *dev) uc_priv->supported = DMA_SUPPORTS_MEM_TO_MEM | DMA_SUPPORTS_MEM_TO_DEV; - return ret; + return 0; } static int udma_push_to_ring(struct k3_nav_ring *ring, void *elem) |