The symbol is not visible and only used by of_dma_is_coherent, which
has no current callers.
It was added to extend devices with a DMA coherency attribute like done
in Linux and was renamed there in commit c00a60d6f4a1 ("of: address: always
use dma_default_coherent for default coherency"), so have barebox follow
suit.
No functional change.
Signed-off-by: Ahmad Fatoum <a.fat...@pengutronix.de>
---
v1 -> v2:
- new patch to sync with Linux
---
arch/Kconfig | 7 +++++++
arch/riscv/Kconfig | 2 +-
drivers/of/Kconfig | 4 ----
drivers/of/platform.c | 2 +-
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/arch/Kconfig b/arch/Kconfig
index 1a9d32370422..2212b8928829 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -11,3 +11,10 @@ source "arch/$(SRCARCH)/Kconfig"
config ARCH_HAS_CTRLC
bool
+
+#
+# Select this option if the architecture assumes DMA devices are coherent
+# by default.
+#
+config ARCH_DMA_DEFAULT_COHERENT
+ bool
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index afbd55aa3e6f..c31c39454a25 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -10,7 +10,7 @@ config RISCV
select COMMON_CLK_OF_PROVIDER
select CLKDEV_LOOKUP
select HAS_DMA
- select OF_DMA_DEFAULT_COHERENT
+ select ARCH_DMA_DEFAULT_COHERENT
select HAVE_PBL_IMAGE
select HAVE_PBL_MULTI_IMAGES
select HAVE_IMAGE_COMPRESSION
diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
index 816aff0063b0..71f6103f0e69 100644
--- a/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@ -35,10 +35,6 @@ config FEATURE_CONTROLLER_FIXUP
config OF_ADDRESS_PCI
bool
-config OF_DMA_DEFAULT_COHERENT
- # arches should select this if DMA is coherent by default for OF devices
- bool
-
config OF_GPIO
depends on GPIOLIB
depends on OFDEVICE
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index 9ba4438812c1..dc6c53b7163b 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -109,7 +109,7 @@ bool of_dma_is_coherent(struct device_node *node)
node = of_get_next_dma_parent(node);
}
- return IS_ENABLED(CONFIG_OF_DMA_DEFAULT_COHERENT);
+ return IS_ENABLED(CONFIG_ARCH_DMA_DEFAULT_COHERENT);
}
EXPORT_SYMBOL_GPL(of_dma_is_coherent);
--
2.39.2
