From f5bd84762f4b351dcbf309e0a64c7255a2ec1320 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Tue, 27 Feb 2024 20:30:05 +0800 Subject: [PATCH] rockchip: backport missing i2s2 device node Fixes: 70f07967a39b ("rockchip: add ROCK 3A support") Signed-off-by: Tianling Shen --- ...rockchip-RK356x-Add-I2S2-device-node.patch | 45 +++++++++++++++++++ ...hip-Add-I2S2-node-for-RADXA-Rock-3A.patch} | 0 ...-nodes-for-SDIO-UART-Wi-Fi-Bluetoot.patch} | 0 ...ip-Add-support-of-external-clock-to.patch} | 0 ...d-support-of-regulator-for-ethernet.patch} | 0 ...ove-unsupported-property-from-sdmmc.patch} | 0 ...pdate-eMMC-SD-aliases-for-Radxa-SBC.patch} | 0 ...-missing-sdmmc2-SDR-rates-to-rock-3.patch} | 0 8 files changed, 45 insertions(+) create mode 100644 target/linux/rockchip/patches-6.1/008-03-v6.2-arm64-dts-rockchip-RK356x-Add-I2S2-device-node.patch rename target/linux/rockchip/patches-6.1/{008-03-v6.2-arm64-dts-rockchip-Add-I2S2-node-for-RADXA-Rock-3A.patch => 008-04-v6.2-arm64-dts-rockchip-Add-I2S2-node-for-RADXA-Rock-3A.patch} (100%) rename target/linux/rockchip/patches-6.1/{008-04-v6.2-arm64-dts-rockchip-Add-nodes-for-SDIO-UART-Wi-Fi-Bluetoot.patch => 008-05-v6.2-arm64-dts-rockchip-Add-nodes-for-SDIO-UART-Wi-Fi-Bluetoot.patch} (100%) rename target/linux/rockchip/patches-6.1/{008-05-v6.2-arm64-dts-rockchip-Add-support-of-external-clock-to.patch => 008-06-v6.2-arm64-dts-rockchip-Add-support-of-external-clock-to.patch} (100%) rename target/linux/rockchip/patches-6.1/{008-06-v6.2-arm64-dts-rockchip-Add-support-of-regulator-for-ethernet.patch => 008-07-v6.2-arm64-dts-rockchip-Add-support-of-regulator-for-ethernet.patch} (100%) rename target/linux/rockchip/patches-6.1/{008-07-v6.2-arm64-dts-rockchip-remove-unsupported-property-from-sdmmc.patch => 008-08-v6.2-arm64-dts-rockchip-remove-unsupported-property-from-sdmmc.patch} (100%) rename target/linux/rockchip/patches-6.1/{008-08-v6.3-arm64-dts-rockchip-Update-eMMC-SD-aliases-for-Radxa-SBC.patch => 008-09-v6.3-arm64-dts-rockchip-Update-eMMC-SD-aliases-for-Radxa-SBC.patch} (100%) rename target/linux/rockchip/patches-6.1/{008-09-v6.7-arm64-dts-rockchip-Add-missing-sdmmc2-SDR-rates-to-rock-3.patch => 008-10-v6.7-arm64-dts-rockchip-Add-missing-sdmmc2-SDR-rates-to-rock-3.patch} (100%) diff --git a/target/linux/rockchip/patches-6.1/008-03-v6.2-arm64-dts-rockchip-RK356x-Add-I2S2-device-node.patch b/target/linux/rockchip/patches-6.1/008-03-v6.2-arm64-dts-rockchip-RK356x-Add-I2S2-device-node.patch new file mode 100644 index 0000000000..146587d344 --- /dev/null +++ b/target/linux/rockchip/patches-6.1/008-03-v6.2-arm64-dts-rockchip-RK356x-Add-I2S2-device-node.patch @@ -0,0 +1,45 @@ +From 755f37010f3eac0bdfa41bdf2308e8380a93f10c Mon Sep 17 00:00:00 2001 +From: Shengyu Qu +Date: Sun, 30 Oct 2022 01:09:04 +0800 +Subject: [PATCH] arm64: dts: rockchip: RK356x: Add I2S2 device node + +This patch adds I2S2 device tree node for RK3566/RK3568. + +Signed-off-by: Shengyu Qu +Link: https://lore.kernel.org/r/OS3P286MB259771C12F2B15A4DDF435FE98359@OS3P286MB2597.JPNP286.PROD.OUTLOOK.COM +Signed-off-by: Heiko Stuebner +--- + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +--- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi +@@ -1108,6 +1108,28 @@ + status = "disabled"; + }; + ++ i2s2_2ch: i2s@fe420000 { ++ compatible = "rockchip,rk3568-i2s-tdm"; ++ reg = <0x0 0xfe420000 0x0 0x1000>; ++ interrupts = ; ++ assigned-clocks = <&cru CLK_I2S2_2CH_SRC>; ++ assigned-clock-rates = <1188000000>; ++ clocks = <&cru MCLK_I2S2_2CH>, <&cru MCLK_I2S2_2CH>, <&cru HCLK_I2S2_2CH>; ++ clock-names = "mclk_tx", "mclk_rx", "hclk"; ++ dmas = <&dmac1 4>, <&dmac1 5>; ++ dma-names = "tx", "rx"; ++ resets = <&cru SRST_M_I2S2_2CH>; ++ reset-names = "m"; ++ rockchip,grf = <&grf>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&i2s2m0_sclktx ++ &i2s2m0_lrcktx ++ &i2s2m0_sdi ++ &i2s2m0_sdo>; ++ #sound-dai-cells = <0>; ++ status = "disabled"; ++ }; ++ + i2s3_2ch: i2s@fe430000 { + compatible = "rockchip,rk3568-i2s-tdm"; + reg = <0x0 0xfe430000 0x0 0x1000>; diff --git a/target/linux/rockchip/patches-6.1/008-03-v6.2-arm64-dts-rockchip-Add-I2S2-node-for-RADXA-Rock-3A.patch b/target/linux/rockchip/patches-6.1/008-04-v6.2-arm64-dts-rockchip-Add-I2S2-node-for-RADXA-Rock-3A.patch similarity index 100% rename from target/linux/rockchip/patches-6.1/008-03-v6.2-arm64-dts-rockchip-Add-I2S2-node-for-RADXA-Rock-3A.patch rename to target/linux/rockchip/patches-6.1/008-04-v6.2-arm64-dts-rockchip-Add-I2S2-node-for-RADXA-Rock-3A.patch diff --git a/target/linux/rockchip/patches-6.1/008-04-v6.2-arm64-dts-rockchip-Add-nodes-for-SDIO-UART-Wi-Fi-Bluetoot.patch b/target/linux/rockchip/patches-6.1/008-05-v6.2-arm64-dts-rockchip-Add-nodes-for-SDIO-UART-Wi-Fi-Bluetoot.patch similarity index 100% rename from target/linux/rockchip/patches-6.1/008-04-v6.2-arm64-dts-rockchip-Add-nodes-for-SDIO-UART-Wi-Fi-Bluetoot.patch rename to target/linux/rockchip/patches-6.1/008-05-v6.2-arm64-dts-rockchip-Add-nodes-for-SDIO-UART-Wi-Fi-Bluetoot.patch diff --git a/target/linux/rockchip/patches-6.1/008-05-v6.2-arm64-dts-rockchip-Add-support-of-external-clock-to.patch b/target/linux/rockchip/patches-6.1/008-06-v6.2-arm64-dts-rockchip-Add-support-of-external-clock-to.patch similarity index 100% rename from target/linux/rockchip/patches-6.1/008-05-v6.2-arm64-dts-rockchip-Add-support-of-external-clock-to.patch rename to target/linux/rockchip/patches-6.1/008-06-v6.2-arm64-dts-rockchip-Add-support-of-external-clock-to.patch diff --git a/target/linux/rockchip/patches-6.1/008-06-v6.2-arm64-dts-rockchip-Add-support-of-regulator-for-ethernet.patch b/target/linux/rockchip/patches-6.1/008-07-v6.2-arm64-dts-rockchip-Add-support-of-regulator-for-ethernet.patch similarity index 100% rename from target/linux/rockchip/patches-6.1/008-06-v6.2-arm64-dts-rockchip-Add-support-of-regulator-for-ethernet.patch rename to target/linux/rockchip/patches-6.1/008-07-v6.2-arm64-dts-rockchip-Add-support-of-regulator-for-ethernet.patch diff --git a/target/linux/rockchip/patches-6.1/008-07-v6.2-arm64-dts-rockchip-remove-unsupported-property-from-sdmmc.patch b/target/linux/rockchip/patches-6.1/008-08-v6.2-arm64-dts-rockchip-remove-unsupported-property-from-sdmmc.patch similarity index 100% rename from target/linux/rockchip/patches-6.1/008-07-v6.2-arm64-dts-rockchip-remove-unsupported-property-from-sdmmc.patch rename to target/linux/rockchip/patches-6.1/008-08-v6.2-arm64-dts-rockchip-remove-unsupported-property-from-sdmmc.patch diff --git a/target/linux/rockchip/patches-6.1/008-08-v6.3-arm64-dts-rockchip-Update-eMMC-SD-aliases-for-Radxa-SBC.patch b/target/linux/rockchip/patches-6.1/008-09-v6.3-arm64-dts-rockchip-Update-eMMC-SD-aliases-for-Radxa-SBC.patch similarity index 100% rename from target/linux/rockchip/patches-6.1/008-08-v6.3-arm64-dts-rockchip-Update-eMMC-SD-aliases-for-Radxa-SBC.patch rename to target/linux/rockchip/patches-6.1/008-09-v6.3-arm64-dts-rockchip-Update-eMMC-SD-aliases-for-Radxa-SBC.patch diff --git a/target/linux/rockchip/patches-6.1/008-09-v6.7-arm64-dts-rockchip-Add-missing-sdmmc2-SDR-rates-to-rock-3.patch b/target/linux/rockchip/patches-6.1/008-10-v6.7-arm64-dts-rockchip-Add-missing-sdmmc2-SDR-rates-to-rock-3.patch similarity index 100% rename from target/linux/rockchip/patches-6.1/008-09-v6.7-arm64-dts-rockchip-Add-missing-sdmmc2-SDR-rates-to-rock-3.patch rename to target/linux/rockchip/patches-6.1/008-10-v6.7-arm64-dts-rockchip-Add-missing-sdmmc2-SDR-rates-to-rock-3.patch