X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=drivers%2Fof%2Faddress.c;h=b3bf8762f4e8ce48a34cfe545f60036ee7ddb973;hb=809f1863e83e31e3c3cc259fd2cc1470fc772aa5;hp=4fe5fe21cd49e1d4cc170940fc6bd1f3b97838e2;hpb=14323b731072b09a375e7b53aba6d0d68f603fcb;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

diff --git a/drivers/of/address.c b/drivers/of/address.c
index 4fe5fe21cd49..b3bf8762f4e8 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -1009,12 +1009,16 @@ EXPORT_SYMBOL_GPL(of_dma_get_range);
  * @np:	device node
  *
  * It returns true if "dma-coherent" property was found
- * for this device in DT.
+ * for this device in the DT, or if DMA is coherent by
+ * default for OF devices on the current platform.
  */
 bool of_dma_is_coherent(struct device_node *np)
 {
 	struct device_node *node = of_node_get(np);
 
+	if (IS_ENABLED(CONFIG_OF_DMA_DEFAULT_COHERENT))
+		return true;
+
 	while (node) {
 		if (of_property_read_bool(node, "dma-coherent")) {
 			of_node_put(node);