Fixes for 5.4

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

diff --git a/queue-5.4/arm-dts-rockchip-rk3066a-add-sound-dai-cells-to-hdmi.patch b/queue-5.4/arm-dts-rockchip-rk3066a-add-sound-dai-cells-to-hdmi.patch
new file mode 100644 (file)
index 0000000..507574b
--- /dev/null
+++ b/queue-5.4/arm-dts-rockchip-rk3066a-add-sound-dai-cells-to-hdmi.patch
@@ -0,0 +1,37 @@
+From fa9f593afaedccc418fb8a34fa63e1200ae86566 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Thu, 13 Jun 2024 20:08:10 +0200
+Subject: ARM: dts: rockchip: rk3066a: add #sound-dai-cells to hdmi node
+
+From: Johan Jonker <jbx6244@gmail.com>
+
+[ Upstream commit cca46f811d0000c1522a5e18ea48c27a15e45c05 ]
+
+'#sound-dai-cells' is required to properly interpret
+the list of DAI specified in the 'sound-dai' property,
+so add them to the 'hdmi' node for 'rk3066a.dtsi'.
+
+Fixes: fadc78062477 ("ARM: dts: rockchip: add rk3066 hdmi nodes")
+Signed-off-by: Johan Jonker <jbx6244@gmail.com>
+Link: https://lore.kernel.org/r/8b229dcc-94e4-4bbc-9efc-9d5ddd694532@gmail.com
+Signed-off-by: Heiko Stuebner <heiko@sntech.de>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ arch/arm/boot/dts/rk3066a.dtsi | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi
+index 1ac9deb3bd39a..055687d3153fb 100644
+--- a/arch/arm/boot/dts/rk3066a.dtsi
++++ b/arch/arm/boot/dts/rk3066a.dtsi
+@@ -124,6 +124,7 @@
+               pinctrl-0 = <&hdmii2c_xfer>, <&hdmi_hpd>;
+               power-domains = <&power RK3066_PD_VIO>;
+               rockchip,grf = <&grf>;
++              #sound-dai-cells = <0>;
+               status = "disabled";
+ 
+               ports {
+-- 
+2.43.0
+

diff --git a/queue-5.4/arm64-dts-rockchip-add-sound-dai-cells-for-rk3368.patch b/queue-5.4/arm64-dts-rockchip-add-sound-dai-cells-for-rk3368.patch
new file mode 100644 (file)
index 0000000..e417599
--- /dev/null
+++ b/queue-5.4/arm64-dts-rockchip-add-sound-dai-cells-for-rk3368.patch
@@ -0,0 +1,52 @@
+From 327da079f0a966f15c0836b4845f5e341f782156 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 fd86188010b29..45f40cfaca4fa 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi
++++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
+@@ -686,6 +686,7 @@
+               dma-names = "tx";
+               pinctrl-names = "default";
+               pinctrl-0 = <&spdif_tx>;
++              #sound-dai-cells = <0>;
+               status = "disabled";
+       };
+ 
+@@ -697,6 +698,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";
+       };
+ 
+@@ -710,6 +712,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-5.4/series b/queue-5.4/series
index a5fc24b97d484fc22ab7f8e64942344424f4a67a..5c78496bcd733cd5408dc20264302fe211e79082 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -234,3 +234,5 @@ nfs-leave-pages-in-the-pagecache-if-readpage-failed.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
+arm-dts-rockchip-rk3066a-add-sound-dai-cells-to-hdmi.patch
+arm64-dts-rockchip-add-sound-dai-cells-for-rk3368.patch