| Message ID | 20241024041851.5600-1-honyuenkwun@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | arm64: dts: rockchip: reorder audio/hdmi nodes in Orange Pi 5 | expand |
On Wed, 23 Oct 2024 23:18:51 -0500, Jimmy Hon wrote: > 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. > > [...] Applied, thanks! [1/1] arm64: dts: rockchip: reorder audio/hdmi nodes in Orange Pi 5 commit: b5e273e26a6a298de46f73ffd4bad6c0b7384c38 Best regards,
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 @@ button-recovery { }; }; - 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 @@ masterdai: simple-audio-card,codec { }; }; + hdmi0-con { + compatible = "hdmi-connector"; + type = "a"; + + port { + hdmi0_con_in: endpoint { + remote-endpoint = <&hdmi0_out_con>; + }; + }; + }; + leds { compatible = "gpio-leds"; pinctrl-names = "default";
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> --- .../boot/dts/rockchip/rk3588s-orangepi-5.dts | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-)