summaryrefslogtreecommitdiffstats
path: root/drivers/of
diff options
context:
space:
mode:
authorChristoph Hellwig2019-02-03 20:12:02 +0100
committerChristoph Hellwig2019-02-20 15:26:35 +0100
commitff4c25f26a71b79c70ea03b3935a1297439a8a85 (patch)
treebb278baf485553d3a73b4de530edcc2287e003a5 /drivers/of
parentdma-mapping: remove an incorrect __iommem annotation (diff)
downloadkernel-qcow2-linux-ff4c25f26a71b79c70ea03b3935a1297439a8a85.tar.gz
kernel-qcow2-linux-ff4c25f26a71b79c70ea03b3935a1297439a8a85.tar.xz
kernel-qcow2-linux-ff4c25f26a71b79c70ea03b3935a1297439a8a85.zip
dma-mapping: improve selection of dma_declare_coherent availability
This API is primarily used through DT entries, but two architectures and two drivers call it directly. So instead of selecting the config symbol for random architectures pull it in implicitly for the actual users. Also rename the Kconfig option to describe the feature better. Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Paul Burton <paul.burton@mips.com> # MIPS Acked-by: Lee Jones <lee.jones@linaro.org> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/of')
-rw-r--r--drivers/of/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
index 3607fd2810e4..37c2ccbefecd 100644
--- a/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@ -43,6 +43,7 @@ config OF_FLATTREE
config OF_EARLY_FLATTREE
bool
+ select DMA_DECLARE_COHERENT if HAS_DMA
select OF_FLATTREE
config OF_PROMTREE
@@ -83,7 +84,7 @@ config OF_MDIO
config OF_RESERVED_MEM
bool
depends on OF_EARLY_FLATTREE
- default y if HAVE_GENERIC_DMA_COHERENT || DMA_CMA
+ default y if DMA_DECLARE_COHERENT || DMA_CMA
config OF_RESOLVE
bool