Fixes for 5.15

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

diff --git a/queue-5.15/arm-dts-rockchip-rk3066a-add-sound-dai-cells-to-hdmi.patch b/queue-5.15/arm-dts-rockchip-rk3066a-add-sound-dai-cells-to-hdmi.patch
new file mode 100644 (file)
index 0000000..07da4bb
--- /dev/null
+++ b/queue-5.15/arm-dts-rockchip-rk3066a-add-sound-dai-cells-to-hdmi.patch
@@ -0,0 +1,37 @@
+From 0a711a2c77552ccbead3526518a3385d4b3df895 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 ae4055428c5e1..85b5c506662eb 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.15/arm64-dts-rockchip-add-sound-dai-cells-for-rk3368.patch b/queue-5.15/arm64-dts-rockchip-add-sound-dai-cells-for-rk3368.patch
new file mode 100644 (file)
index 0000000..b62b27c
--- /dev/null
+++ b/queue-5.15/arm64-dts-rockchip-add-sound-dai-cells-for-rk3368.patch
@@ -0,0 +1,52 @@
+From 1ab8bccba1895469700d5824f917adc00a3926ed 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 4c64fbefb4834..ad58930d5ccec 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi
++++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
+@@ -678,6 +678,7 @@
+               dma-names = "tx";
+               pinctrl-names = "default";
+               pinctrl-0 = <&spdif_tx>;
++              #sound-dai-cells = <0>;
+               status = "disabled";
+       };
+ 
+@@ -689,6 +690,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";
+       };
+ 
+@@ -702,6 +704,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.15/arm64-dts-rockchip-fix-pmic-interrupt-pin-on-rock-pi.patch b/queue-5.15/arm64-dts-rockchip-fix-pmic-interrupt-pin-on-rock-pi.patch
new file mode 100644 (file)
index 0000000..a3714d9
--- /dev/null
+++ b/queue-5.15/arm64-dts-rockchip-fix-pmic-interrupt-pin-on-rock-pi.patch
@@ -0,0 +1,39 @@
+From 4b463a85e05be3d690e0c51e881cc7deee8e7e1c Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Wed, 19 Jun 2024 14:00:46 +0900
+Subject: arm64: dts: rockchip: fix PMIC interrupt pin on ROCK Pi E
+
+From: FUKAUMI Naoki <naoki@radxa.com>
+
+[ Upstream commit 02afd3d5b9fa4ffed284c0f7e7bec609097804fc ]
+
+use GPIO0_A2 as interrupt pin for PMIC. GPIO2_A6 was used for
+pre-production board.
+
+Fixes: b918e81f2145 ("arm64: dts: rockchip: rk3328: Add Radxa ROCK Pi E")
+Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
+Link: https://lore.kernel.org/r/20240619050047.1217-1-naoki@radxa.com
+Signed-off-by: Heiko Stuebner <heiko@sntech.de>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
+index 018a3a5075c72..d9905a08c6ce8 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
+@@ -186,8 +186,8 @@
+       rk805: pmic@18 {
+               compatible = "rockchip,rk805";
+               reg = <0x18>;
+-              interrupt-parent = <&gpio2>;
+-              interrupts = <6 IRQ_TYPE_LEVEL_LOW>;
++              interrupt-parent = <&gpio0>;
++              interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
+               #clock-cells = <1>;
+               clock-output-names = "xin32k", "rk805-clkout2";
+               gpio-controller;
+-- 
+2.43.0
+

diff --git a/queue-5.15/series b/queue-5.15/series
index 45a153a74335e32d37aec70aaf1c6cc9d4669251..256c016e1499966df81d00cfcab99e59439beda7 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -384,3 +384,6 @@ 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-fix-pmic-interrupt-pin-on-rock-pi.patch
+arm64-dts-rockchip-add-sound-dai-cells-for-rk3368.patch