1 files changed, 13 insertions, 10 deletions

diff --git a/drivers/dma/txx9dmac.c b/drivers/dma/txx9dmac.c
index 75fcf1ac8bb7..cbd83e362b5e 100644
--- a/drivers/dma/txx9dmac.c
+++ b/drivers/dma/txx9dmac.c
@@ -938,12 +938,17 @@ txx9dmac_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
         return &first->txd;
 }
 
-static void txx9dmac_terminate_all(struct dma_chan *chan)
+static int txx9dmac_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
+                            unsigned long arg)
 {
         struct txx9dmac_chan *dc = to_txx9dmac_chan(chan);
         struct txx9dmac_desc *desc, *_desc;
         LIST_HEAD(list);
 
+        /* Only supports DMA_TERMINATE_ALL */
+        if (cmd != DMA_TERMINATE_ALL)
+                return -EINVAL;
+
         dev_vdbg(chan2dev(chan), "terminate_all\n");
         spin_lock_bh(&dc->lock);
 
@@ -958,12 +963,13 @@ static void txx9dmac_terminate_all(struct dma_chan *chan)
         /* Flush all pending and queued descriptors */
         list_for_each_entry_safe(desc, _desc, &list, desc_node)
                 txx9dmac_descriptor_complete(dc, desc);
+
+        return 0;
 }
 
 static enum dma_status
-txx9dmac_is_tx_complete(struct dma_chan *chan,
-                        dma_cookie_t cookie,
-                dma_cookie_t *done, dma_cookie_t *used)
+txx9dmac_tx_status(struct dma_chan *chan, dma_cookie_t cookie,
+                   struct dma_tx_state *txstate)
 {
         struct txx9dmac_chan *dc = to_txx9dmac_chan(chan);
         dma_cookie_t last_used;
@@ -985,10 +991,7 @@ txx9dmac_is_tx_complete(struct dma_chan *chan,
                 ret = dma_async_is_complete(cookie, last_complete, last_used);
         }
 
-        if (done)
-                *done = last_complete;
-        if (used)
-                *used = last_used;
+        dma_set_tx_state(txstate, last_complete, last_used, 0);
 
         return ret;
 }
@@ -1153,8 +1156,8 @@ static int __init txx9dmac_chan_probe(struct platform_device *pdev)
         dc->dma.dev = &pdev->dev;
         dc->dma.device_alloc_chan_resources = txx9dmac_alloc_chan_resources;
         dc->dma.device_free_chan_resources = txx9dmac_free_chan_resources;
-        dc->dma.device_terminate_all = txx9dmac_terminate_all;
-        dc->dma.device_is_tx_complete = txx9dmac_is_tx_complete;
+        dc->dma.device_control = txx9dmac_control;
+        dc->dma.device_tx_status = txx9dmac_tx_status;
         dc->dma.device_issue_pending = txx9dmac_issue_pending;
         if (pdata && pdata->memcpy_chan == ch) {
                 dc->dma.device_prep_dma_memcpy = txx9dmac_prep_dma_memcpy;