From 275a68cd0bf4414c886f9f4a5e39f7f166fe4286 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= <megi@xff.cz>
Date: Sun, 9 May 2021 23:43:21 +0200
Subject: Move a node to avoid merge conflict

---
 arch/arm/boot/dts/allwinner/sunxi-h3-h5.dtsi  | 12 ++++-----
 .../dts/allwinner/sun50i-h6-orangepi-3.dts    |  8 +++---
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi  | 27 +++++++++----------
 3 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/arch/arm/boot/dts/allwinner/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/allwinner/sunxi-h3-h5.dtsi
index 0f19e7c00c50..a872fc586ab6 100644
--- a/arch/arm/boot/dts/allwinner/sunxi-h3-h5.dtsi
+++ b/arch/arm/boot/dts/allwinner/sunxi-h3-h5.dtsi
@@ -100,12 +100,6 @@ osc32k: osc32k-clk {
 		};
 	};
 
-	de: display-engine {
-		compatible = "allwinner,sun8i-h3-display-engine";
-		allwinner,pipelines = <&mixer0>;
-		status = "disabled";
-	};
-
 	sound_hdmi: sound_hdmi {
 		compatible = "allwinner,sun9i-a80-hdmi-audio",
 			     "allwinner,sun8i-h3-hdmi-audio";
@@ -120,6 +114,12 @@ cpu {
 		};
 	};
 
+	de: display-engine {
+		compatible = "allwinner,sun8i-h3-display-engine";
+		allwinner,pipelines = <&mixer0>;
+		status = "disabled";
+	};
+
 	soc {
 		compatible = "simple-bus";
 		#address-cells = <1>;
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
index 7e11286bf6d1..d1f5daf63484 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
@@ -128,6 +128,10 @@ &gpu {
 	status = "okay";
 };
 
+&i2s1 {
+	status = "okay";
+};
+
 &hdmi {
 	status = "okay";
 };
@@ -167,10 +171,6 @@ ext_rgmii_phy: ethernet-phy@1 {
 	};
 };
 
-&i2s1 {
-	status = "okay";
-};
-
 &mmc0 {
 	vmmc-supply = <&reg_cldo1>;
 	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
index 13fe21b00711..c4e35a255643 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
@@ -126,20 +126,6 @@ psci {
 		method = "smc";
 	};
 
-	sound_hdmi: sound_hdmi {
-		compatible = "allwinner,sun9i-a80-hdmi-audio",
-			     "allwinner,sun50i-h6-hdmi-audio";
-		status = "disabled";
-
-		codec {
-			sound-dai = <&hdmi>;
-		};
-
-		cpu {
-			sound-dai = <&i2s1>;
-		};
-	};
-
 	timer {
 		compatible = "arm,armv8-timer";
 		arm,no-tick-in-suspend;
@@ -153,6 +139,19 @@ timer {
 			(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
 	};
 
+	sound_hdmi: sound_hdmi {
+		compatible = "allwinner,sun9i-a80-hdmi-audio",
+			     "allwinner,sun50i-h6-hdmi-audio";
+		status = "disabled";
+
+		codec {
+			sound-dai = <&hdmi>;
+		};
+
+		cpu {
+			sound-dai = <&i2s1>;
+		};
+	};
 
 	soc {
 		compatible = "simple-bus";
-- 
2.35.3