From 71d70cd3c2e730c6d4654e11f1054c2a613a3afa Mon Sep 17 00:00:00 2001
From: Pierre-Yves MORDRET <pierre-yves.mordret@foss.st.com>
Date: Wed, 17 May 2023 16:03:33 +0200
Subject: [PATCH] ARM: dts: stm32: move linux,cma node for stm32mp157[c|f]-ev1
 boards

Move linux,cma node from stm32mp157c-ev1-scmi.dtsi to
stm32mp157[c|f]-ed1.dts for stm32mp157[c|f]-ev1 boards

Change-Id: Ida583b7d86e7c10a325daf768adcb15248400240
Signed-off-by: Pierre-Yves MORDRET <pierre-yves.mordret@foss.st.com>
Reviewed-on: https://gerrit.st.com/c/mpu/oe/st/linux-stm32/+/307014
Tested-by: Eric FOURMONT <eric.fourmont-ext@st.com>
Reviewed-by: Eric FOURMONT <eric.fourmont-ext@st.com>
Domain-Review: Eric FOURMONT <eric.fourmont-ext@st.com>
---
 arch/arm/boot/dts/stm32mp157c-ed1.dts       | 9 +++++++++
 arch/arm/boot/dts/stm32mp157c-ev1-scmi.dtsi | 9 ---------
 arch/arm/boot/dts/stm32mp157f-ed1.dts       | 9 +++++++++
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/arch/arm/boot/dts/stm32mp157c-ed1.dts b/arch/arm/boot/dts/stm32mp157c-ed1.dts
index 5969be502276..849227aa47f4 100644
--- a/arch/arm/boot/dts/stm32mp157c-ed1.dts
+++ b/arch/arm/boot/dts/stm32mp157c-ed1.dts
@@ -83,6 +83,15 @@
 			reg = <0xe8000000 0x8000000>;
 			no-map;
 		};
+
+		/* global autoconfigured region for contiguous allocations */
+		linux,cma {
+			compatible = "shared-dma-pool";
+			reusable;
+			size = <0x8000000>;
+			alignment = <0x2000>;
+			linux,cma-default;
+		};
 	};
 
 	led {
diff --git a/arch/arm/boot/dts/stm32mp157c-ev1-scmi.dtsi b/arch/arm/boot/dts/stm32mp157c-ev1-scmi.dtsi
index a7fdcf16e324..135ef35e1db1 100644
--- a/arch/arm/boot/dts/stm32mp157c-ev1-scmi.dtsi
+++ b/arch/arm/boot/dts/stm32mp157c-ev1-scmi.dtsi
@@ -10,15 +10,6 @@
 			reg = <0xfe000000 0x2000000>;
 			no-map;
 		};
-
-		/* global autoconfigured region for contiguous allocations */
-		linux,cma {
-			compatible = "shared-dma-pool";
-			reusable;
-			size = <0x8000000>;
-			alignment = <0x2000>;
-			linux,cma-default;
-		};
 	};
 };
 
diff --git a/arch/arm/boot/dts/stm32mp157f-ed1.dts b/arch/arm/boot/dts/stm32mp157f-ed1.dts
index ad30ff5926a9..127af532e18a 100644
--- a/arch/arm/boot/dts/stm32mp157f-ed1.dts
+++ b/arch/arm/boot/dts/stm32mp157f-ed1.dts
@@ -83,6 +83,15 @@
 			reg = <0xe8000000 0x8000000>;
 			no-map;
 		};
+
+		/* global autoconfigured region for contiguous allocations */
+		linux,cma {
+			compatible = "shared-dma-pool";
+			reusable;
+			size = <0x8000000>;
+			alignment = <0x2000>;
+			linux,cma-default;
+		};
 	};
 
 	led {