From 776e2b5c1cf8856682024779ed5d6b53f28e3e3f Mon Sep 17 00:00:00 2001 From: Alex Bee Date: Sun, 18 Apr 2021 19:19:10 +0200 Subject: [PATCH] Rockchip: align sound card names with alsa config --- .../default/linux-1003-for-libreelec.patch | 43 ++++++++++++++++++- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/projects/Rockchip/patches/linux/default/linux-1003-for-libreelec.patch b/projects/Rockchip/patches/linux/default/linux-1003-for-libreelec.patch index cafe8218db..ff563de04d 100644 --- a/projects/Rockchip/patches/linux/default/linux-1003-for-libreelec.patch +++ b/projects/Rockchip/patches/linux/default/linux-1003-for-libreelec.patch @@ -196,7 +196,7 @@ Signed-off-by: Alex Bee 1 file changed, 20 insertions(+) diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts -index 713f55e143c6..2420d8e1c66f 100644 +index 713f55e143c6..8d30c49f406e 100644 --- a/arch/arm/boot/dts/rk3288-miqi.dts +++ b/arch/arm/boot/dts/rk3288-miqi.dts @@ -78,6 +78,21 @@ vcc_sys: vsys-regulator { @@ -207,7 +207,7 @@ index 713f55e143c6..2420d8e1c66f 100644 + sound { + compatible = "simple-audio-card"; + simple-audio-card,format = "i2s"; -+ simple-audio-card,name = "rockchip,miqi-codec"; ++ simple-audio-card,name = "HDMI"; + simple-audio-card,mclk-fs = <512>; + + simple-audio-card,codec { @@ -234,6 +234,44 @@ index 713f55e143c6..2420d8e1c66f 100644 status = "okay"; +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Alex Bee +Date: Fri, 2 Apr 2021 17:54:22 +0200 +Subject: [PATCH] ARM64/ARM: dts: align sound card names + +Signed-off-by: Alex Bee +--- + arch/arm/boot/dts/rk3288-tinker.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi +index 9c1e38c54eae..ee332fc9cf1f 100644 +--- a/arch/arm/boot/dts/rk3288-tinker.dtsi ++++ b/arch/arm/boot/dts/rk3288-tinker.dtsi +@@ -75,7 +75,7 @@ sdio_pwrseq: sdio-pwrseq { + sound { + compatible = "simple-audio-card"; + simple-audio-card,format = "i2s"; +- simple-audio-card,name = "rockchip,tinker-codec"; ++ simple-audio-card,name = "HDMI"; + simple-audio-card,mclk-fs = <512>; + + simple-audio-card,codec { +diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi +index 03c6737ca0ea..9c2ac03c154b 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi +@@ -1782,7 +1782,7 @@ hdmi_sound: hdmi-sound { + compatible = "simple-audio-card"; + simple-audio-card,format = "i2s"; + simple-audio-card,mclk-fs = <256>; +- simple-audio-card,name = "hdmi-sound"; ++ simple-audio-card,name = "HDMI"; + status = "disabled"; + + simple-audio-card,cpu { + From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alex Bee Date: Wed, 10 Feb 2021 18:44:56 +0200 @@ -726,3 +764,4 @@ index 70ab4fbdc23e..4dbc370e538f 100644 cec_transmit_attempt_done(adap, cec->tx_status); } if (cec->rx_done) { +