summaryrefslogtreecommitdiffstats
path: root/drivers/amba
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-11-14 16:54:12 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-11-14 16:54:12 -0800
commite37e0ee0190034a059c9faea8adfb4982fb24ddd (patch)
treeba6d6da8ae099eb734f4d8d33bf648fe0dfa39e7 /drivers/amba
parent23c258763ba992f6a95a4b8980ffa7c1890bc8d8 (diff)
parentc9eb6172c328dde7e14812f94f8da87b691e41b5 (diff)
downloadlinux-stable-e37e0ee0190034a059c9faea8adfb4982fb24ddd.tar.gz
linux-stable-e37e0ee0190034a059c9faea8adfb4982fb24ddd.tar.bz2
linux-stable-e37e0ee0190034a059c9faea8adfb4982fb24ddd.zip
Merge tag 'dma-mapping-4.15' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping updates from Christoph Hellwig: - turn dma_cache_sync into a dma_map_ops instance and remove implementation that purely are dead because the architecture doesn't support noncoherent allocations - add a flag for busses that need DMA configuration (Robin Murphy) * tag 'dma-mapping-4.15' of git://git.infradead.org/users/hch/dma-mapping: dma-mapping: turn dma_cache_sync into a dma_map_ops method sh: make dma_cache_sync a no-op xtensa: make dma_cache_sync a no-op unicore32: make dma_cache_sync a no-op powerpc: make dma_cache_sync a no-op mn10300: make dma_cache_sync a no-op microblaze: make dma_cache_sync a no-op ia64: make dma_cache_sync a no-op frv: make dma_cache_sync a no-op x86: make dma_cache_sync a no-op floppy: consolidate the dummy fd_cacheflush definition drivers: flag buses which demand DMA configuration
Diffstat (limited to 'drivers/amba')
-rw-r--r--drivers/amba/bus.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index e0f74ddc22b7..594c228d2f02 100644
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -195,6 +195,7 @@ struct bus_type amba_bustype = {
.match = amba_match,
.uevent = amba_uevent,
.pm = &amba_pm,
+ .force_dma = true,
};
static int __init amba_init(void)