From 0cb57255bcc21a3ee39b9eb812edc7cbfee6a950 Mon Sep 17 00:00:00 2001
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
Date: Tue, 18 Feb 2020 15:23:00 +0100
Subject: ARM: dts: stm32mp: align barebox dtsi name with upstream

Upstream has split stm32mp157c.dtsi into three files:

- stm32mp157.dtsi: GPU, DSI and stm32mp153.dtsi
- stm32mp153.dtsi: 2x CAN, 2nd Cortex-A7 and stm32mp151.dtsi
- stm32mp151.dtsi: everything else

Have our barebox specific fixup file follow the new naming scheme.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/dts/stm32mp151.dtsi      | 38 ++++++++++++++++++++++++++++++++++++++
 arch/arm/dts/stm32mp157a-dk1.dtsi |  2 +-
 arch/arm/dts/stm32mp157c.dtsi     | 38 --------------------------------------
 3 files changed, 39 insertions(+), 39 deletions(-)
 create mode 100644 arch/arm/dts/stm32mp151.dtsi
 delete mode 100644 arch/arm/dts/stm32mp157c.dtsi

diff --git a/arch/arm/dts/stm32mp151.dtsi b/arch/arm/dts/stm32mp151.dtsi
new file mode 100644
index 0000000000..e416c89856
--- /dev/null
+++ b/arch/arm/dts/stm32mp151.dtsi
@@ -0,0 +1,38 @@
+
+/ {
+	clocks {
+		/* Needed to let barebox find the clock nodes */
+		compatible = "simple-bus";
+	};
+
+	aliases {
+		gpio0 = &gpioa;
+		gpio1 = &gpiob;
+		gpio2 = &gpioc;
+		gpio3 = &gpiod;
+		gpio4 = &gpioe;
+		gpio5 = &gpiof;
+		gpio6 = &gpiog;
+		gpio7 = &gpioh;
+		gpio8 = &gpioi;
+		gpio9 = &gpioj;
+		gpio10 = &gpiok;
+		gpio25 = &gpioz;
+		mmc0 = &sdmmc1;
+	};
+
+	psci {
+		compatible = "arm,psci-0.2";
+	};
+
+	soc {
+		memory-controller@5a003000 {
+			compatible = "st,stm32mp1-ddr";
+			reg = <0x5a003000 0x1000>;
+		};
+	};
+};
+
+&bsec {
+	barebox,provide-mac-address = <&ethernet0 0x39>;
+};
diff --git a/arch/arm/dts/stm32mp157a-dk1.dtsi b/arch/arm/dts/stm32mp157a-dk1.dtsi
index 6be208f32e..baaf60b18f 100644
--- a/arch/arm/dts/stm32mp157a-dk1.dtsi
+++ b/arch/arm/dts/stm32mp157a-dk1.dtsi
@@ -4,7 +4,7 @@
  * Author: Alexandre Torgue <alexandre.torgue@st.com>.
  */
 
-#include "stm32mp157c.dtsi"
+#include "stm32mp151.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 
 / {
diff --git a/arch/arm/dts/stm32mp157c.dtsi b/arch/arm/dts/stm32mp157c.dtsi
deleted file mode 100644
index e416c89856..0000000000
--- a/arch/arm/dts/stm32mp157c.dtsi
+++ /dev/null
@@ -1,38 +0,0 @@
-
-/ {
-	clocks {
-		/* Needed to let barebox find the clock nodes */
-		compatible = "simple-bus";
-	};
-
-	aliases {
-		gpio0 = &gpioa;
-		gpio1 = &gpiob;
-		gpio2 = &gpioc;
-		gpio3 = &gpiod;
-		gpio4 = &gpioe;
-		gpio5 = &gpiof;
-		gpio6 = &gpiog;
-		gpio7 = &gpioh;
-		gpio8 = &gpioi;
-		gpio9 = &gpioj;
-		gpio10 = &gpiok;
-		gpio25 = &gpioz;
-		mmc0 = &sdmmc1;
-	};
-
-	psci {
-		compatible = "arm,psci-0.2";
-	};
-
-	soc {
-		memory-controller@5a003000 {
-			compatible = "st,stm32mp1-ddr";
-			reg = <0x5a003000 0x1000>;
-		};
-	};
-};
-
-&bsec {
-	barebox,provide-mac-address = <&ethernet0 0x39>;
-};
-- 
cgit v1.2.3