From df0083d39588139bb2685d1e829a526104d3a347 Mon Sep 17 00:00:00 2001 From: Piotr Szczepanik Date: Sat, 6 Jun 2020 19:52:47 +0200 Subject: [PATCH] Enabled HDMI audio for OrangePi 4 (#2009) --- .../kernel/rk3399-legacy/xunlong-orangepi4.patch | 4 ++-- .../rockchip64-current/add-board-orangepi-4.patch | 15 ++------------- .../rockchip64-dev/add-board-orangepi-4.patch | 15 ++------------- 3 files changed, 6 insertions(+), 28 deletions(-) diff --git a/patch/kernel/rk3399-legacy/xunlong-orangepi4.patch b/patch/kernel/rk3399-legacy/xunlong-orangepi4.patch index 97a950d5be..86e8f8e8f0 100644 --- a/patch/kernel/rk3399-legacy/xunlong-orangepi4.patch +++ b/patch/kernel/rk3399-legacy/xunlong-orangepi4.patch @@ -243,11 +243,11 @@ index 00000000..17010305 + }; + + hdmi_sound: hdmi-sound { -+ status = "disable"; ++ status = "okay"; + compatible = "simple-audio-card"; + simple-audio-card,format = "i2s"; + simple-audio-card,mclk-fs = <256>; -+ simple-audio-card,name = "rockchip,hdmi"; ++ simple-audio-card,name = "hdmi-sound"; + + simple-audio-card,cpu { + sound-dai = <&i2s2>; diff --git a/patch/kernel/rockchip64-current/add-board-orangepi-4.patch b/patch/kernel/rockchip64-current/add-board-orangepi-4.patch index ea886eb38b..cb4aaa1069 100644 --- a/patch/kernel/rockchip64-current/add-board-orangepi-4.patch +++ b/patch/kernel/rockchip64-current/add-board-orangepi-4.patch @@ -15,7 +15,7 @@ new file mode 100644 index 000000000..1e1747ceb --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-orangepi-4.dts -@@ -0,0 +1,1134 @@ +@@ -0,0 +1,1123 @@ +/* + * SPDX-License-Identifier: (GPL-2.0+ or MIT) + * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd. @@ -218,18 +218,7 @@ index 000000000..1e1747ceb + }; + + hdmi_sound: hdmi-sound { -+ status = "disable"; -+ compatible = "simple-audio-card"; -+ simple-audio-card,format = "i2s"; -+ simple-audio-card,mclk-fs = <256>; -+ simple-audio-card,name = "rockchip,hdmi"; -+ -+ simple-audio-card,cpu { -+ sound-dai = <&i2s2>; -+ }; -+ simple-audio-card,codec { -+ sound-dai = <&hdmi>; -+ }; ++ status = "okay"; + }; + + hdmi_dp_sound: hdmi-dp-sound { diff --git a/patch/kernel/rockchip64-dev/add-board-orangepi-4.patch b/patch/kernel/rockchip64-dev/add-board-orangepi-4.patch index ea886eb38b..cb4aaa1069 100644 --- a/patch/kernel/rockchip64-dev/add-board-orangepi-4.patch +++ b/patch/kernel/rockchip64-dev/add-board-orangepi-4.patch @@ -15,7 +15,7 @@ new file mode 100644 index 000000000..1e1747ceb --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-orangepi-4.dts -@@ -0,0 +1,1134 @@ +@@ -0,0 +1,1123 @@ +/* + * SPDX-License-Identifier: (GPL-2.0+ or MIT) + * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd. @@ -218,18 +218,7 @@ index 000000000..1e1747ceb + }; + + hdmi_sound: hdmi-sound { -+ status = "disable"; -+ compatible = "simple-audio-card"; -+ simple-audio-card,format = "i2s"; -+ simple-audio-card,mclk-fs = <256>; -+ simple-audio-card,name = "rockchip,hdmi"; -+ -+ simple-audio-card,cpu { -+ sound-dai = <&i2s2>; -+ }; -+ simple-audio-card,codec { -+ sound-dai = <&hdmi>; -+ }; ++ status = "okay"; + }; + + hdmi_dp_sound: hdmi-dp-sound {