summaryrefslogtreecommitdiff
path: root/drivers/soc
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2019-02-15 18:01:47 +0100
committerArnd Bergmann <arnd@arndb.de>2019-02-15 18:02:04 +0100
commit50b0225bf412df3cdeb2dc89b7e4b1119e30bedb (patch)
tree1d1065be8855c4db666af6eff58950a0e1fb50d5 /drivers/soc
parent187b4ac7dfeb74cf6e6043f82aeab4ddc2a4c44a (diff)
parent2b13ef1f4261688c2dc5d67dbee69ed2fdddf53e (diff)
Merge tag 'drivers_soc_for_5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into arm/drivers
soc: ti: couple of non critical fixes for v5.1 - Fix the Clang warning for enum in Navigator dma - Simplify code in ti_sci with DEFINE_SHOW_ATTRIBUTE macro * tag 'drivers_soc_for_5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone: soc: ti: knav_dma: Use proper enum in pktdma_init_chan firmware: ti_sci: Change to use DEFINE_SHOW_ATTRIBUTE macro Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/soc')
-rw-r--r--drivers/soc/ti/knav_dma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/soc/ti/knav_dma.c b/drivers/soc/ti/knav_dma.c
index e05ab16d9a9e..6285cd8efb21 100644
--- a/drivers/soc/ti/knav_dma.c
+++ b/drivers/soc/ti/knav_dma.c
@@ -598,7 +598,7 @@ static int pktdma_init_chan(struct knav_dma_device *dma,
INIT_LIST_HEAD(&chan->list);
chan->dma = dma;
- chan->direction = DMA_NONE;
+ chan->direction = DMA_TRANS_NONE;
atomic_set(&chan->ref_count, 0);
spin_lock_init(&chan->lock);