diff --git a/patch/kernel/archive/rockchip64-6.10/board-rockpis-0001-arm64-dts.patch b/patch/kernel/archive/rockchip64-6.10/board-rockpis-0001-arm64-dts.patch index e8f0b61c55..fe2d91d22f 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-rockpis-0001-arm64-dts.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-rockpis-0001-arm64-dts.patch @@ -233,7 +233,7 @@ index e9810d2f0407..0d917658d24a 100644 }; }; -+&acodec { ++&codec { + status = "okay"; + #sound-dai-cells = <0>; +}; diff --git a/patch/kernel/archive/rockchip64-6.10/board-rockpis-0010-arm64-dts-rockchip-add-i2s_8ch-for-rk3308.patch b/patch/kernel/archive/rockchip64-6.10/board-rockpis-0010-arm64-dts-rockchip-add-i2s_8ch-for-rk3308.patch.disabled similarity index 100% rename from patch/kernel/archive/rockchip64-6.10/board-rockpis-0010-arm64-dts-rockchip-add-i2s_8ch-for-rk3308.patch rename to patch/kernel/archive/rockchip64-6.10/board-rockpis-0010-arm64-dts-rockchip-add-i2s_8ch-for-rk3308.patch.disabled diff --git a/patch/kernel/archive/rockchip64-6.10/board-rockpis-0018-ASoC-codecs-Add-RK3308-internal-codec-driver.patch b/patch/kernel/archive/rockchip64-6.10/board-rockpis-0018-ASoC-codecs-Add-RK3308-internal-codec-driver.patch.disabled similarity index 100% rename from patch/kernel/archive/rockchip64-6.10/board-rockpis-0018-ASoC-codecs-Add-RK3308-internal-codec-driver.patch rename to patch/kernel/archive/rockchip64-6.10/board-rockpis-0018-ASoC-codecs-Add-RK3308-internal-codec-driver.patch.disabled diff --git a/patch/kernel/archive/rockchip64-6.10/board-rockpis-0019-Sync-rk3308_codec-to-BSP-tree.patch b/patch/kernel/archive/rockchip64-6.10/board-rockpis-0019-Sync-rk3308_codec-to-BSP-tree.patch.disabled similarity index 100% rename from patch/kernel/archive/rockchip64-6.10/board-rockpis-0019-Sync-rk3308_codec-to-BSP-tree.patch rename to patch/kernel/archive/rockchip64-6.10/board-rockpis-0019-Sync-rk3308_codec-to-BSP-tree.patch.disabled diff --git a/patch/kernel/archive/rockchip64-6.10/board-rockpis-0020-arm64-dts-rockchip-Add-acodec-node-for-rk3308.patch b/patch/kernel/archive/rockchip64-6.10/board-rockpis-0020-arm64-dts-rockchip-Add-acodec-node-for-rk3308.patch.disabled similarity index 100% rename from patch/kernel/archive/rockchip64-6.10/board-rockpis-0020-arm64-dts-rockchip-Add-acodec-node-for-rk3308.patch rename to patch/kernel/archive/rockchip64-6.10/board-rockpis-0020-arm64-dts-rockchip-Add-acodec-node-for-rk3308.patch.disabled diff --git a/patch/kernel/archive/rockchip64-6.10/board-rockpis-0022-ASoC-rk3308_codec-replace-codec-to-component.patch b/patch/kernel/archive/rockchip64-6.10/board-rockpis-0022-ASoC-rk3308_codec-replace-codec-to-component.patch.disabled similarity index 100% rename from patch/kernel/archive/rockchip64-6.10/board-rockpis-0022-ASoC-rk3308_codec-replace-codec-to-component.patch rename to patch/kernel/archive/rockchip64-6.10/board-rockpis-0022-ASoC-rk3308_codec-replace-codec-to-component.patch.disabled diff --git a/patch/kernel/archive/rockchip64-6.10/board-rocks0-0001-deviceTree.patch b/patch/kernel/archive/rockchip64-6.10/board-rocks0-0001-deviceTree.patch index 886bbce39a..fa0f46a0c8 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-rocks0-0001-deviceTree.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-rocks0-0001-deviceTree.patch @@ -184,7 +184,7 @@ index 000000000..aded16959 + }; +}; + -+&acodec { ++&codec { + status = "okay"; + #sound-dai-cells = <0>; +}; diff --git a/patch/kernel/archive/rockchip64-6.10/rk3308-add-missing-i2s-controllers.patch b/patch/kernel/archive/rockchip64-6.10/rk3308-add-missing-i2s-controllers.patch new file mode 100644 index 0000000000..33577be68b --- /dev/null +++ b/patch/kernel/archive/rockchip64-6.10/rk3308-add-missing-i2s-controllers.patch @@ -0,0 +1,82 @@ +From 8c92404a280aa7f35a311fb0939b8276371fcba3 Mon Sep 17 00:00:00 2001 +From: Paolo Sabatino +Date: Sun, 21 Jul 2024 14:18:30 +0200 +Subject: [PATCH] add missing i2s controllers + +--- + arch/arm64/boot/dts/rockchip/rk3308.dtsi | 59 ++++++++++++++++++++++++ + 1 file changed, 59 insertions(+) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi +index c00da150a22f..a9d1cb1debe9 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi +@@ -578,6 +578,65 @@ dmac1: dma-controller@ff2d0000 { + #dma-cells = <1>; + }; + ++ i2s_8ch_0: i2s@ff300000 { ++ compatible = "rockchip,rk3308-i2s-tdm"; ++ reg = <0x0 0xff300000 0x0 0x1000>; ++ interrupts = ; ++ clocks = <&cru SCLK_I2S0_8CH_TX>, <&cru SCLK_I2S0_8CH_RX>, <&cru HCLK_I2S0_8CH>, ++ <&cru SCLK_I2S0_8CH_TX_SRC>, ++ <&cru SCLK_I2S0_8CH_RX_SRC>, ++ <&cru PLL_VPLL0>, ++ <&cru PLL_VPLL1>; ++ clock-names = "mclk_tx", "mclk_rx", "hclk", ++ "mclk_tx_src", "mclk_rx_src", ++ "mclk_root0", "mclk_root1"; ++ dmas = <&dmac1 0>, <&dmac1 1>; ++ dma-names = "tx", "rx"; ++ resets = <&cru SRST_I2S0_8CH_TX_M>, <&cru SRST_I2S0_8CH_RX_M>; ++ reset-names = "tx-m", "rx-m"; ++ rockchip,cru = <&cru>; ++ rockchip,grf = <&grf>; ++ rockchip,mclk-calibrate; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&i2s_8ch_0_sclktx ++ &i2s_8ch_0_sclkrx ++ &i2s_8ch_0_lrcktx ++ &i2s_8ch_0_lrckrx ++ &i2s_8ch_0_sdi0 ++ &i2s_8ch_0_sdi1 ++ &i2s_8ch_0_sdi2 ++ &i2s_8ch_0_sdi3 ++ &i2s_8ch_0_sdo0 ++ &i2s_8ch_0_sdo1 ++ &i2s_8ch_0_sdo2 ++ &i2s_8ch_0_sdo3 ++ &i2s_8ch_0_mclk>; ++ status = "disabled"; ++ }; ++ ++ i2s_8ch_1: i2s@ff310000 { ++ compatible = "rockchip,rk3308-i2s-tdm"; ++ reg = <0x0 0xff310000 0x0 0x1000>; ++ interrupts = ; ++ clocks = <&cru SCLK_I2S1_8CH_TX>, <&cru SCLK_I2S1_8CH_RX>, <&cru HCLK_I2S1_8CH>, ++ <&cru SCLK_I2S1_8CH_TX_SRC>, ++ <&cru SCLK_I2S1_8CH_RX_SRC>, ++ <&cru PLL_VPLL0>, ++ <&cru PLL_VPLL1>; ++ clock-names = "mclk_tx", "mclk_rx", "hclk", ++ "mclk_tx_src", "mclk_rx_src", ++ "mclk_root0", "mclk_root1"; ++ dmas = <&dmac1 2>, <&dmac1 3>; ++ dma-names = "tx", "rx"; ++ resets = <&cru SRST_I2S1_8CH_TX_M>, <&cru SRST_I2S1_8CH_RX_M>; ++ reset-names = "tx-m", "rx-m"; ++ rockchip,cru = <&cru>; ++ rockchip,grf = <&grf>; ++ rockchip,mclk-calibrate; ++ rockchip,io-multiplex; ++ status = "disabled"; ++ }; ++ + /* + * - can be clock producer or consumer + * - up to 8 capture channels and 2 playback channels +-- +2.34.1 +