From: Sasha Levin Date: Sun, 29 Oct 2023 19:45:27 +0000 (-0400) Subject: Drop arm64-dts-rockchip-add-i2s0-2ch-bus-bclk-off-pins-to.patch X-Git-Tag: v6.1.61~46 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a382504d888482c56259e140d14db403fa104668;p=thirdparty%2Fkernel%2Fstable-queue.git Drop arm64-dts-rockchip-add-i2s0-2ch-bus-bclk-off-pins-to.patch Signed-off-by: Sasha Levin --- diff --git a/queue-6.1/arm64-dts-rockchip-add-i2s0-2ch-bus-bclk-off-pins-to.patch b/queue-6.1/arm64-dts-rockchip-add-i2s0-2ch-bus-bclk-off-pins-to.patch deleted file mode 100644 index ac255d3f5ce..00000000000 --- a/queue-6.1/arm64-dts-rockchip-add-i2s0-2ch-bus-bclk-off-pins-to.patch +++ /dev/null @@ -1,51 +0,0 @@ -From d780a9e16872a923cbe7c7288982b53719f8e08b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 13 Oct 2023 12:47:26 +0100 -Subject: arm64: dts: rockchip: Add i2s0-2ch-bus-bclk-off pins to RK3399 - -From: Christopher Obbard - -[ Upstream commit 3975e72b164dc8347a28dd0d5f11b346af534635 ] - -Commit 0efaf8078393 ("arm64: dts: rockchip: add i2s0-2ch-bus pins on -rk3399") introduced a pinctl for i2s0 in two-channel mode. Commit -91419ae0420f ("arm64: dts: rockchip: use BCLK to GPIO switch on rk3399") -modified i2s0 to switch the corresponding pins off when idle. - -Although an idle pinctrl node was added for i2s0 in 8-channel mode, a -similar idle pinctrl node for i2s0 in 2-channel mode was not added. Add -it. - -Fixes: 91419ae0420f ("arm64: dts: rockchip: use BCLK to GPIO switch on rk3399") -Signed-off-by: Christopher Obbard -Link: https://lore.kernel.org/r/20231013114737.494410-2-chris.obbard@collabora.com -Signed-off-by: Heiko Stuebner -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/rockchip/rk3399.dtsi | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi -index 5f3caf01badeb..d6e6147652f36 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi -@@ -2406,6 +2406,16 @@ - <4 RK_PA0 1 &pcfg_pull_none>; - }; - -+ i2s0_2ch_bus_bclk_off: i2s0-2ch-bus-bclk-off { -+ rockchip,pins = -+ <3 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>, -+ <3 RK_PD1 1 &pcfg_pull_none>, -+ <3 RK_PD2 1 &pcfg_pull_none>, -+ <3 RK_PD3 1 &pcfg_pull_none>, -+ <3 RK_PD7 1 &pcfg_pull_none>, -+ <4 RK_PA0 1 &pcfg_pull_none>; -+ }; -+ - i2s0_8ch_bus: i2s0-8ch-bus { - rockchip,pins = - <3 RK_PD0 1 &pcfg_pull_none>, --- -2.42.0 - diff --git a/queue-6.1/series b/queue-6.1/series index c11eacd73b6..41be20bc6c3 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -31,7 +31,6 @@ arm-omap-timer32k-fix-all-kernel-doc-warnings.patch firmware-imx-dsp-fix-use_after_free-in-imx_dsp_setup.patch clk-ti-fix-missing-omap4-mcbsp-functional-clock-and-.patch clk-ti-fix-missing-omap5-mcbsp-functional-clock-and-.patch -arm64-dts-rockchip-add-i2s0-2ch-bus-bclk-off-pins-to.patch r8169-fix-the-kcsan-reported-data-race-in-rtl_tx-whi.patch r8169-fix-the-kcsan-reported-data-race-in-rtl_tx-whi.patch-18717 r8169-fix-the-kcsan-reported-data-race-in-rtl_rx-whi.patch diff --git a/queue-6.5/arm64-dts-rockchip-add-i2s0-2ch-bus-bclk-off-pins-to.patch b/queue-6.5/arm64-dts-rockchip-add-i2s0-2ch-bus-bclk-off-pins-to.patch deleted file mode 100644 index 5769065bc5d..00000000000 --- a/queue-6.5/arm64-dts-rockchip-add-i2s0-2ch-bus-bclk-off-pins-to.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 702e0678a86e7ebd312cfa19cdc84bf06a1941f6 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 13 Oct 2023 12:47:26 +0100 -Subject: arm64: dts: rockchip: Add i2s0-2ch-bus-bclk-off pins to RK3399 - -From: Christopher Obbard - -[ Upstream commit 3975e72b164dc8347a28dd0d5f11b346af534635 ] - -Commit 0efaf8078393 ("arm64: dts: rockchip: add i2s0-2ch-bus pins on -rk3399") introduced a pinctl for i2s0 in two-channel mode. Commit -91419ae0420f ("arm64: dts: rockchip: use BCLK to GPIO switch on rk3399") -modified i2s0 to switch the corresponding pins off when idle. - -Although an idle pinctrl node was added for i2s0 in 8-channel mode, a -similar idle pinctrl node for i2s0 in 2-channel mode was not added. Add -it. - -Fixes: 91419ae0420f ("arm64: dts: rockchip: use BCLK to GPIO switch on rk3399") -Signed-off-by: Christopher Obbard -Link: https://lore.kernel.org/r/20231013114737.494410-2-chris.obbard@collabora.com -Signed-off-by: Heiko Stuebner -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/rockchip/rk3399.dtsi | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi -index bf1251cc71954..63f3d6e6a8631 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi -@@ -2440,6 +2440,16 @@ - <4 RK_PA0 1 &pcfg_pull_none>; - }; - -+ i2s0_2ch_bus_bclk_off: i2s0-2ch-bus-bclk-off { -+ rockchip,pins = -+ <3 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>, -+ <3 RK_PD1 1 &pcfg_pull_none>, -+ <3 RK_PD2 1 &pcfg_pull_none>, -+ <3 RK_PD3 1 &pcfg_pull_none>, -+ <3 RK_PD7 1 &pcfg_pull_none>, -+ <4 RK_PA0 1 &pcfg_pull_none>; -+ }; -+ - i2s0_8ch_bus: i2s0-8ch-bus { - rockchip,pins = - <3 RK_PD0 1 &pcfg_pull_none>, --- -2.42.0 - diff --git a/queue-6.5/series b/queue-6.5/series index a2387d295ad..c11abef1ffa 100644 --- a/queue-6.5/series +++ b/queue-6.5/series @@ -47,7 +47,6 @@ arm-omap-timer32k-fix-all-kernel-doc-warnings.patch firmware-imx-dsp-fix-use_after_free-in-imx_dsp_setup.patch clk-ti-fix-missing-omap4-mcbsp-functional-clock-and-.patch clk-ti-fix-missing-omap5-mcbsp-functional-clock-and-.patch -arm64-dts-rockchip-add-i2s0-2ch-bus-bclk-off-pins-to.patch r8169-fix-the-kcsan-reported-data-race-in-rtl_tx-whi.patch r8169-fix-the-kcsan-reported-data-race-in-rtl_tx-whi.patch-11985 r8169-fix-the-kcsan-reported-data-race-in-rtl_rx-whi.patch