summaryrefslogtreecommitdiffstats
path: root/drivers/of
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-09-02 20:09:36 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-09-02 20:09:36 -0700
commit60c1f89241d49bacf71035470684a8d7b4bb46ea (patch)
treef545bc7a0ddd189b956e65353f36661f4fc12ae1 /drivers/of
parent57361846b52bc686112da6ca5368d11210796804 (diff)
parent8c89ef7b6b64ba093239305f77a485905d03f7bf (diff)
downloadlinux-60c1f89241d49bacf71035470684a8d7b4bb46ea.tar.bz2
Merge tag 'dma-mapping-4.19-2' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping fixes from Christoph Hellwig: "A few fixes for the fallout of being a little more pedantic about dma masks" * tag 'dma-mapping-4.19-2' of git://git.infradead.org/users/hch/dma-mapping: of/platform: initialise AMBA default DMA masks sparc: set a default 32-bit dma mask for OF devices kernel/dma/direct: take DMA offset into account in dma_direct_supported
Diffstat (limited to 'drivers/of')
-rw-r--r--drivers/of/platform.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index 7ba90c290a42..6c59673933e9 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -241,6 +241,10 @@ static struct amba_device *of_amba_device_create(struct device_node *node,
if (!dev)
goto err_clear_flag;
+ /* AMBA devices only support a single DMA mask */
+ dev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
+ dev->dev.dma_mask = &dev->dev.coherent_dma_mask;
+
/* setup generic device info */
dev->dev.of_node = of_node_get(node);
dev->dev.fwnode = &node->fwnode;