diff --git a/target/linux/rockchip/patches-6.1/008-04-v6.9-arm64-dts-rockchip-fix-reset-names-for-rk356x-i2s2.patch b/target/linux/rockchip/patches-6.1/008-04-v6.9-arm64-dts-rockchip-fix-reset-names-for-rk356x-i2s2.patch new file mode 100644 index 0000000000..70dcbd5012 --- /dev/null +++ b/target/linux/rockchip/patches-6.1/008-04-v6.9-arm64-dts-rockchip-fix-reset-names-for-rk356x-i2s2.patch @@ -0,0 +1,39 @@ +From 0fc19ab75acde78558bd0f6fe3e5f63cf8ee88b0 Mon Sep 17 00:00:00 2001 +From: Heiko Stuebner +Date: Tue, 27 Feb 2024 18:35:26 +0100 +Subject: [PATCH] arm64: dts: rockchip: fix reset-names for rk356x i2s2 + controller +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The dtbscheck reports a warning for a wrong reset-names property for +the i2s2 controller on rk356x socs. + +The other controllers on the soc provide tx and rx directions and hence +two resets and separate clocks for each direction, while i2s2 only +provides one reset. This was so far named just "m" which isn't part of +the binding. + +The clock-names the controller uses all end in "tx", so use the matching +"tx-m" reset-name for the i2s controller. + +Fixes: 755f37010f3e ("arm64: dts: rockchip: RK356x: Add I2S2 device node") +Acked-by: Uwe Kleine-König +Signed-off-by: Heiko Stuebner +Link: https://lore.kernel.org/r/20240227173526.710056-2-heiko@sntech.de +--- + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi +@@ -1119,7 +1119,7 @@ + dmas = <&dmac1 4>, <&dmac1 5>; + dma-names = "tx", "rx"; + resets = <&cru SRST_M_I2S2_2CH>; +- reset-names = "m"; ++ reset-names = "tx-m"; + rockchip,grf = <&grf>; + pinctrl-names = "default"; + pinctrl-0 = <&i2s2m0_sclktx diff --git a/target/linux/rockchip/patches-6.1/008-04-v6.2-arm64-dts-rockchip-Add-I2S2-node-for-RADXA-Rock-3A.patch b/target/linux/rockchip/patches-6.1/008-05-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-04-v6.2-arm64-dts-rockchip-Add-I2S2-node-for-RADXA-Rock-3A.patch rename to target/linux/rockchip/patches-6.1/008-05-v6.2-arm64-dts-rockchip-Add-I2S2-node-for-RADXA-Rock-3A.patch diff --git a/target/linux/rockchip/patches-6.1/008-05-v6.2-arm64-dts-rockchip-Add-nodes-for-SDIO-UART-Wi-Fi-Bluetoot.patch b/target/linux/rockchip/patches-6.1/008-06-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-05-v6.2-arm64-dts-rockchip-Add-nodes-for-SDIO-UART-Wi-Fi-Bluetoot.patch rename to target/linux/rockchip/patches-6.1/008-06-v6.2-arm64-dts-rockchip-Add-nodes-for-SDIO-UART-Wi-Fi-Bluetoot.patch diff --git a/target/linux/rockchip/patches-6.1/008-06-v6.2-arm64-dts-rockchip-Add-support-of-external-clock-to.patch b/target/linux/rockchip/patches-6.1/008-07-v6.2-arm64-dts-rockchip-Add-support-of-external-clock-to.patch similarity index 100% rename from target/linux/rockchip/patches-6.1/008-06-v6.2-arm64-dts-rockchip-Add-support-of-external-clock-to.patch rename to target/linux/rockchip/patches-6.1/008-07-v6.2-arm64-dts-rockchip-Add-support-of-external-clock-to.patch diff --git a/target/linux/rockchip/patches-6.1/008-07-v6.2-arm64-dts-rockchip-Add-support-of-regulator-for-ethernet.patch b/target/linux/rockchip/patches-6.1/008-08-v6.2-arm64-dts-rockchip-Add-support-of-regulator-for-ethernet.patch similarity index 100% rename from target/linux/rockchip/patches-6.1/008-07-v6.2-arm64-dts-rockchip-Add-support-of-regulator-for-ethernet.patch rename to target/linux/rockchip/patches-6.1/008-08-v6.2-arm64-dts-rockchip-Add-support-of-regulator-for-ethernet.patch diff --git a/target/linux/rockchip/patches-6.1/008-08-v6.2-arm64-dts-rockchip-remove-unsupported-property-from-sdmmc.patch b/target/linux/rockchip/patches-6.1/008-09-v6.2-arm64-dts-rockchip-remove-unsupported-property-from-sdmmc.patch similarity index 100% rename from target/linux/rockchip/patches-6.1/008-08-v6.2-arm64-dts-rockchip-remove-unsupported-property-from-sdmmc.patch rename to target/linux/rockchip/patches-6.1/008-09-v6.2-arm64-dts-rockchip-remove-unsupported-property-from-sdmmc.patch diff --git a/target/linux/rockchip/patches-6.1/008-09-v6.3-arm64-dts-rockchip-Update-eMMC-SD-aliases-for-Radxa-SBC.patch b/target/linux/rockchip/patches-6.1/008-10-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-09-v6.3-arm64-dts-rockchip-Update-eMMC-SD-aliases-for-Radxa-SBC.patch rename to target/linux/rockchip/patches-6.1/008-10-v6.3-arm64-dts-rockchip-Update-eMMC-SD-aliases-for-Radxa-SBC.patch diff --git a/target/linux/rockchip/patches-6.1/008-10-v6.7-arm64-dts-rockchip-Add-missing-sdmmc2-SDR-rates-to-rock-3.patch b/target/linux/rockchip/patches-6.1/008-11-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-10-v6.7-arm64-dts-rockchip-Add-missing-sdmmc2-SDR-rates-to-rock-3.patch rename to target/linux/rockchip/patches-6.1/008-11-v6.7-arm64-dts-rockchip-Add-missing-sdmmc2-SDR-rates-to-rock-3.patch diff --git a/target/linux/rockchip/patches-6.1/050-35-v6.9-arm64-dts-rockchip-add-clock-to-vo1-grf-syscon-on-rk3588.patch b/target/linux/rockchip/patches-6.1/050-35-v6.9-arm64-dts-rockchip-add-clock-to-vo1-grf-syscon-on-rk3588.patch new file mode 100644 index 0000000000..5ef421a37a --- /dev/null +++ b/target/linux/rockchip/patches-6.1/050-35-v6.9-arm64-dts-rockchip-add-clock-to-vo1-grf-syscon-on-rk3588.patch @@ -0,0 +1,25 @@ +From 2047366b9eff8fada2a118588b0478de6e92d02c Mon Sep 17 00:00:00 2001 +From: Heiko Stuebner +Date: Tue, 27 Feb 2024 22:05:21 +0100 +Subject: [PATCH] arm64: dts: rockchip: add clock to vo1-grf syscon on rk3588 + +The VO*-general-register-files need a clock, so add the correct one. + +Cc: Sebastian Reichel +Reviewed-by: Sebastian Reichel +Signed-off-by: Heiko Stuebner +Link: https://lore.kernel.org/r/20240227210521.724754-1-heiko@sntech.de +--- + arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +@@ -510,6 +510,7 @@ + vo1_grf: syscon@fd5a8000 { + compatible = "rockchip,rk3588-vo-grf", "syscon"; + reg = <0x0 0xfd5a8000 0x0 0x100>; ++ clocks = <&cru PCLK_VO1GRF>; + }; + + php_grf: syscon@fd5b0000 { diff --git a/target/linux/rockchip/patches-6.1/050-36-v6.9-arm64-dts-rockchip-drop-rockchip-trcm-sync-tx-only-from.patch b/target/linux/rockchip/patches-6.1/050-36-v6.9-arm64-dts-rockchip-drop-rockchip-trcm-sync-tx-only-from.patch new file mode 100644 index 0000000000..d664342086 --- /dev/null +++ b/target/linux/rockchip/patches-6.1/050-36-v6.9-arm64-dts-rockchip-drop-rockchip-trcm-sync-tx-only-from.patch @@ -0,0 +1,46 @@ +From a8037ceb89649659831e86a87a9329d1bb43c735 Mon Sep 17 00:00:00 2001 +From: Heiko Stuebner +Date: Tue, 27 Feb 2024 17:46:56 +0100 +Subject: [PATCH] arm64: dts: rockchip: drop rockchip,trcm-sync-tx-only from + rk3588 i2s + +The rockchip,trcm-sync-tx-only property is at this time only documented +for the tdm variant of Rockchip i2s controllers. + +While there was a series [0] adding code and binding for the property, +it doesn't seem to have gone forward back in 2021. + +So for now fix the devicetree check by removing the property from rk3588 +i2s controllers until support for it gets merged. + +[0] https://patchwork.kernel.org/project/linux-rockchip/patch/1629796734-4243-5-git-send-email-sugar.zhang@rock-chips.com/ + +Fixes: 8ae112a5554f ("arm64: dts: rockchip: Add rk3588s I2S nodes") +Cc: Sugar Zhang +Cc: Cristian Ciocaltea +Signed-off-by: Heiko Stuebner +Reviewed-by: Quentin Schulz +Link: https://lore.kernel.org/r/20240227164659.705271-2-heiko@sntech.de +Signed-off-by: Heiko Stuebner +--- + arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 2 -- + 1 file changed, 2 deletions(-) + +--- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +@@ -1697,7 +1697,6 @@ + dmas = <&dmac1 0>, <&dmac1 1>; + dma-names = "tx", "rx"; + power-domains = <&power RK3588_PD_AUDIO>; +- rockchip,trcm-sync-tx-only; + pinctrl-names = "default"; + pinctrl-0 = <&i2s2m1_lrck + &i2s2m1_sclk +@@ -1718,7 +1717,6 @@ + dmas = <&dmac1 2>, <&dmac1 3>; + dma-names = "tx", "rx"; + power-domains = <&power RK3588_PD_AUDIO>; +- rockchip,trcm-sync-tx-only; + pinctrl-names = "default"; + pinctrl-0 = <&i2s3_lrck + &i2s3_sclk diff --git a/target/linux/rockchip/patches-6.1/112-02-arm64-dts-rockchip-Fix-usb2phy-nodename-for-rk3588.patch b/target/linux/rockchip/patches-6.1/112-02-arm64-dts-rockchip-Fix-usb2phy-nodename-for-rk3588.patch index 64b4b33060..8b723ddd99 100644 --- a/target/linux/rockchip/patches-6.1/112-02-arm64-dts-rockchip-Fix-usb2phy-nodename-for-rk3588.patch +++ b/target/linux/rockchip/patches-6.1/112-02-arm64-dts-rockchip-Fix-usb2phy-nodename-for-rk3588.patch @@ -26,7 +26,7 @@ Signed-off-by: Sebastian Reichel --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi -@@ -533,7 +533,7 @@ +@@ -534,7 +534,7 @@ #address-cells = <1>; #size-cells = <1>; @@ -35,7 +35,7 @@ Signed-off-by: Sebastian Reichel compatible = "rockchip,rk3588-usb2phy"; reg = <0x8000 0x10>; interrupts = ; -@@ -558,7 +558,7 @@ +@@ -559,7 +559,7 @@ #address-cells = <1>; #size-cells = <1>; diff --git a/target/linux/rockchip/patches-6.1/112-03-arm64-dts-rockchip-reorder-usb2phy-properties-for-rk3588.patch b/target/linux/rockchip/patches-6.1/112-03-arm64-dts-rockchip-reorder-usb2phy-properties-for-rk3588.patch index bb51e0f434..65d8d2f599 100644 --- a/target/linux/rockchip/patches-6.1/112-03-arm64-dts-rockchip-reorder-usb2phy-properties-for-rk3588.patch +++ b/target/linux/rockchip/patches-6.1/112-03-arm64-dts-rockchip-reorder-usb2phy-properties-for-rk3588.patch @@ -26,7 +26,7 @@ Signed-off-by: Sebastian Reichel --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi -@@ -536,13 +536,13 @@ +@@ -537,13 +537,13 @@ u2phy2: usb2phy@8000 { compatible = "rockchip,rk3588-usb2phy"; reg = <0x8000 0x10>; @@ -44,7 +44,7 @@ Signed-off-by: Sebastian Reichel status = "disabled"; u2phy2_host: host-port { -@@ -561,13 +561,13 @@ +@@ -562,13 +562,13 @@ u2phy3: usb2phy@c000 { compatible = "rockchip,rk3588-usb2phy"; reg = <0xc000 0x10>; diff --git a/target/linux/rockchip/patches-6.1/112-04-arm64-dts-rockchip-add-USBDP-phys-on-rk3588.patch b/target/linux/rockchip/patches-6.1/112-04-arm64-dts-rockchip-add-USBDP-phys-on-rk3588.patch index 171d766f57..0f8557baa0 100644 --- a/target/linux/rockchip/patches-6.1/112-04-arm64-dts-rockchip-add-USBDP-phys-on-rk3588.patch +++ b/target/linux/rockchip/patches-6.1/112-04-arm64-dts-rockchip-add-USBDP-phys-on-rk3588.patch @@ -103,7 +103,7 @@ Signed-off-by: Sebastian Reichel reg = <0x0 0xfee10000 0x0 0x100>; --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi -@@ -507,11 +507,22 @@ +@@ -507,12 +507,23 @@ reg = <0x0 0xfd5a4000 0x0 0x2000>; }; @@ -116,6 +116,7 @@ Signed-off-by: Sebastian Reichel vo1_grf: syscon@fd5a8000 { compatible = "rockchip,rk3588-vo-grf", "syscon"; reg = <0x0 0xfd5a8000 0x0 0x100>; + clocks = <&cru PCLK_VO1GRF>; }; + usb_grf: syscon@fd5ac000 { @@ -126,7 +127,7 @@ Signed-off-by: Sebastian Reichel php_grf: syscon@fd5b0000 { compatible = "rockchip,rk3588-php-grf", "syscon"; reg = <0x0 0xfd5b0000 0x0 0x1000>; -@@ -527,6 +538,36 @@ +@@ -528,6 +539,36 @@ reg = <0x0 0xfd5c4000 0x0 0x100>; }; @@ -163,7 +164,7 @@ Signed-off-by: Sebastian Reichel usb2phy2_grf: syscon@fd5d8000 { compatible = "rockchip,rk3588-usb2phy-grf", "syscon", "simple-mfd"; reg = <0x0 0xfd5d8000 0x0 0x4000>; -@@ -2352,6 +2393,37 @@ +@@ -2351,6 +2392,37 @@ #dma-cells = <1>; }; diff --git a/target/linux/rockchip/patches-6.1/120-01-arm64-dts-rockchip-rk3588-add-cpu-frequency-scaling.patch b/target/linux/rockchip/patches-6.1/120-01-arm64-dts-rockchip-rk3588-add-cpu-frequency-scaling.patch index 4b431bac24..9fca0f5af1 100644 --- a/target/linux/rockchip/patches-6.1/120-01-arm64-dts-rockchip-rk3588-add-cpu-frequency-scaling.patch +++ b/target/linux/rockchip/patches-6.1/120-01-arm64-dts-rockchip-rk3588-add-cpu-frequency-scaling.patch @@ -536,7 +536,7 @@ Signed-off-by: Sebastian Reichel timer { compatible = "arm,armv8-timer"; interrupts = , -@@ -545,6 +987,16 @@ +@@ -546,6 +988,16 @@ reg = <0x0 0xfd5ac000 0x0 0x4000>; }; diff --git a/target/linux/rockchip/patches-6.1/120-06-arm64-dts-rockchip-enable-RK3588-tsadc-by-default.patch b/target/linux/rockchip/patches-6.1/120-06-arm64-dts-rockchip-enable-RK3588-tsadc-by-default.patch index e76d35829b..6f7772a545 100644 --- a/target/linux/rockchip/patches-6.1/120-06-arm64-dts-rockchip-enable-RK3588-tsadc-by-default.patch +++ b/target/linux/rockchip/patches-6.1/120-06-arm64-dts-rockchip-enable-RK3588-tsadc-by-default.patch @@ -12,7 +12,7 @@ Signed-off-by: Sebastian Reichel --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi -@@ -2732,7 +2732,6 @@ +@@ -2731,7 +2731,6 @@ pinctrl-1 = <&tsadc_shut>; pinctrl-names = "gpio", "otpout"; #thermal-sensor-cells = <1>; diff --git a/target/linux/rockchip/patches-6.1/801-05-arm64-dts-rockchip-rk3588s-add-rng-node.patch b/target/linux/rockchip/patches-6.1/801-05-arm64-dts-rockchip-rk3588s-add-rng-node.patch index f05a429023..40d34b6131 100644 --- a/target/linux/rockchip/patches-6.1/801-05-arm64-dts-rockchip-rk3588s-add-rng-node.patch +++ b/target/linux/rockchip/patches-6.1/801-05-arm64-dts-rockchip-rk3588s-add-rng-node.patch @@ -11,7 +11,7 @@ Change-Id: Ifb8964053daa6b593dd2c2c6a3b8caab8526e56d --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi -@@ -2145,6 +2145,16 @@ +@@ -2146,6 +2146,16 @@ status = "disabled"; }; diff --git a/target/linux/rockchip/patches-6.1/801-06-arm64-dts-rockchip-rk3588s-rng-use-scmi_clk.patch b/target/linux/rockchip/patches-6.1/801-06-arm64-dts-rockchip-rk3588s-rng-use-scmi_clk.patch index 45516a7451..8c4af2c122 100644 --- a/target/linux/rockchip/patches-6.1/801-06-arm64-dts-rockchip-rk3588s-rng-use-scmi_clk.patch +++ b/target/linux/rockchip/patches-6.1/801-06-arm64-dts-rockchip-rk3588s-rng-use-scmi_clk.patch @@ -14,7 +14,7 @@ Change-Id: I49994529fcc209c2bc173c1abc497536fb920302 --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi -@@ -2149,7 +2149,7 @@ +@@ -2150,7 +2150,7 @@ compatible = "rockchip,trngv1"; reg = <0x0 0xfe378000 0x0 0x200>; interrupts = ;