From: Sasha Levin Date: Tue, 2 Jul 2024 10:20:10 +0000 (-0400) Subject: Fixes for 5.10 X-Git-Tag: v4.19.317~36^2~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b7f88dfcb238b6e166ef505d454725e83b101f9;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 5.10 Signed-off-by: Sasha Levin --- diff --git a/queue-5.10/arm-dts-rockchip-rk3066a-add-sound-dai-cells-to-hdmi.patch b/queue-5.10/arm-dts-rockchip-rk3066a-add-sound-dai-cells-to-hdmi.patch new file mode 100644 index 00000000000..feb6261e352 --- /dev/null +++ b/queue-5.10/arm-dts-rockchip-rk3066a-add-sound-dai-cells-to-hdmi.patch @@ -0,0 +1,37 @@ +From 5da98ec85626b3cfccbabd9a1ae5860a01ab726d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 13 Jun 2024 20:08:10 +0200 +Subject: ARM: dts: rockchip: rk3066a: add #sound-dai-cells to hdmi node + +From: Johan Jonker + +[ 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 +Link: https://lore.kernel.org/r/8b229dcc-94e4-4bbc-9efc-9d5ddd694532@gmail.com +Signed-off-by: Heiko Stuebner +Signed-off-by: Sasha Levin +--- + 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 bbc3bff508560..75ea8e03bef0a 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.10/arm64-dts-rockchip-add-sound-dai-cells-for-rk3368.patch b/queue-5.10/arm64-dts-rockchip-add-sound-dai-cells-for-rk3368.patch new file mode 100644 index 00000000000..55642fb003f --- /dev/null +++ b/queue-5.10/arm64-dts-rockchip-add-sound-dai-cells-for-rk3368.patch @@ -0,0 +1,52 @@ +From db7b43642e195f5246a3a4664a0ac953c931661c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 23 Jun 2024 11:01:15 +0200 +Subject: arm64: dts: rockchip: Add sound-dai-cells for RK3368 + +From: Alex Bee + +[ 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 +Link: https://lore.kernel.org/r/20240623090116.670607-4-knaerzche@gmail.com +Signed-off-by: Heiko Stuebner +Signed-off-by: Sasha Levin +--- + 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 3746f23dc3df4..bc4df59df3f1e 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi +@@ -687,6 +687,7 @@ + dma-names = "tx"; + pinctrl-names = "default"; + pinctrl-0 = <&spdif_tx>; ++ #sound-dai-cells = <0>; + status = "disabled"; + }; + +@@ -698,6 +699,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"; + }; + +@@ -711,6 +713,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.10/series b/queue-5.10/series index 96717730e6e..65e40638520 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -338,3 +338,5 @@ efi-memmap-move-manipulation-routines-into-x86-arch-tree.patch efi-xen-set-efi_paravirt-for-xen-dom0-boot-on-all-architectures.patch efi-x86-free-efi-memory-map-only-when-installing-a-new-one.patch kvm-arm64-vgic-v4-make-the-doorbell-request-robust-w.r.t-preemption.patch +arm-dts-rockchip-rk3066a-add-sound-dai-cells-to-hdmi.patch +arm64-dts-rockchip-add-sound-dai-cells-for-rk3368.patch