From: Jimmy Hon <honyuenkwun@gmail.com>
Date: Thu, 24 Oct 2024 04:18:51 +0000 (-0500)
Subject: arm64: dts: rockchip: reorder audio/hdmi nodes in Orange Pi 5
X-Git-Tag: v6.13-rc1~140^2~32^2~15
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=b5e273e26a6a298de46f73ffd4bad6c0b7384c38;p=linux-block.git

arm64: dts: rockchip: reorder audio/hdmi nodes in Orange Pi 5

Fix the node order so analog-audio is before hdmi0-con

Audio was submitted first, and it wanted to live above the leds node.
Next, the HDMI was submitted, but it wanted to live above the leds node.
However, HDMI was approved first, so the Audio node ended up living above
the leds node.

Fixes: ae46756faff8 ("arm64: dts: rockchip: analog audio on Orange Pi 5")
Signed-off-by: Jimmy Hon <honyuenkwun@gmail.com>
Link: https://lore.kernel.org/r/20241024041851.5600-1-honyuenkwun@gmail.com
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
index 4ca8b2c0fea7..792432eda867 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
@@ -37,17 +37,6 @@
 		};
 	};
 
-	hdmi0-con {
-		compatible = "hdmi-connector";
-		type = "a";
-
-		port {
-			hdmi0_con_in: endpoint {
-				remote-endpoint = <&hdmi0_out_con>;
-			};
-		};
-	};
-
 	analog-sound {
 		compatible = "simple-audio-card";
 		pinctrl-names = "default";
@@ -81,6 +70,17 @@
 		};
 	};
 
+	hdmi0-con {
+		compatible = "hdmi-connector";
+		type = "a";
+
+		port {
+			hdmi0_con_in: endpoint {
+				remote-endpoint = <&hdmi0_out_con>;
+			};
+		};
+	};
+
 	leds {
 		compatible = "gpio-leds";
 		pinctrl-names = "default";