Fixes for 4.19

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.19/arm64-dts-rockchip-add-sound-dai-cells-for-rk3368.patch b/queue-4.19/arm64-dts-rockchip-add-sound-dai-cells-for-rk3368.patch
new file mode 100644 (file)
index 0000000..1c9b26e
--- /dev/null
+++ b/queue-4.19/arm64-dts-rockchip-add-sound-dai-cells-for-rk3368.patch
@@ -0,0 +1,52 @@
+From 84067f058150bed8c6458ca3eeef936ef4310e69 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Sun, 23 Jun 2024 11:01:15 +0200
+Subject: arm64: dts: rockchip: Add sound-dai-cells for RK3368
+
+From: Alex Bee <knaerzche@gmail.com>
+
+[ Upstream commit 8d7ec44aa5d1eb94a30319074762a1740440cdc8 ]
+
+Add the missing #sound-dai-cells for RK3368's I2S and S/PDIF controllers.
+
+Fixes: f7d89dfe1e31 ("arm64: dts: rockchip: add i2s nodes support for RK3368 SoCs")
+Fixes: 0328d68ea76d ("arm64: dts: rockchip: add rk3368 spdif node")
+Signed-off-by: Alex Bee <knaerzche@gmail.com>
+Link: https://lore.kernel.org/r/20240623090116.670607-4-knaerzche@gmail.com
+Signed-off-by: Heiko Stuebner <heiko@sntech.de>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ arch/arm64/boot/dts/rockchip/rk3368.dtsi | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/rockchip/rk3368.dtsi b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
+index 9c24de1ba43c5..16aec16725c57 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi
++++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
+@@ -677,6 +677,7 @@
+               dma-names = "tx";
+               pinctrl-names = "default";
+               pinctrl-0 = <&spdif_tx>;
++              #sound-dai-cells = <0>;
+               status = "disabled";
+       };
+ 
+@@ -688,6 +689,7 @@
+               clocks = <&cru SCLK_I2S_2CH>, <&cru HCLK_I2S_2CH>;
+               dmas = <&dmac_bus 6>, <&dmac_bus 7>;
+               dma-names = "tx", "rx";
++              #sound-dai-cells = <0>;
+               status = "disabled";
+       };
+ 
+@@ -701,6 +703,7 @@
+               dma-names = "tx", "rx";
+               pinctrl-names = "default";
+               pinctrl-0 = <&i2s_8ch_bus>;
++              #sound-dai-cells = <0>;
+               status = "disabled";
+       };
+ 
+-- 
+2.43.0
+

diff --git a/queue-4.19/series b/queue-4.19/series
index 0bcbe6ff2064d58f6995b1055f903220d047a483..d3d37863008144af78117705fa42d6ec7818689b 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -148,3 +148,4 @@ pwm-stm32-refuse-too-small-period-requests.patch
 ipv6-annotate-some-data-races-around-sk-sk_prot.patch
 ipv6-fix-data-races-around-sk-sk_prot.patch
 tcp-fix-data-races-around-icsk-icsk_af_ops.patch
+arm64-dts-rockchip-add-sound-dai-cells-for-rk3368.patch