From 37031fa7fae5b1213c31bead15289052f3fd889a Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sat, 11 Nov 2023 14:53:04 +0800 Subject: [PATCH] rockchip: update upstreamed patches Signed-off-by: Tianling Shen --- ...-to-get-role-switch-from-tcpc-fwnode.patch | 2 +- ...dts-rockchip-Add-sfc-node-to-rk3588s.patch | 35 ++++++++++ ...d-I2S2-M0-pin-definitions-to-rk3588s.patch | 58 +++++++++++++++++ ...d-UART9-M0-pin-definitions-to-rk3588.patch | 32 +++++++++ ...chip-Add-AV1-decoder-node-to-rk3588s.patch | 37 +++++++++++ ...rm64-dts-rockchip-Add-DFI-to-rk3588s.patch | 50 ++++++++++++++ ...ip-rk3588s-Add-USB3-host-controller.patch} | 10 +-- ...chip-add-ADC-buttons-to-rk3588-evb1.patch} | 14 ++-- ...Remove-duplicate-regulator-vcc3v3_wf.patch | 65 +++++++++++++++++++ ...dts-rockchip-Enable-UART6-on-rock-5b.patch | 32 +++++++++ ...s-rockchip-add-status-LED-to-rock-5b.patch | 57 ++++++++++++++++ ...-rockchip-use-system-LED-for-OpenWrt.patch | 46 +++---------- ...3-arm64-dts-rockchip-lower-mmc-speed.patch | 4 +- ...c3-add-optional-PHY-interface-clocks.patch | 6 +- ...2-usb-typec-tcpm-avoid-graph-warning.patch | 2 +- ...hip-rk3588-add-cpu-frequency-scaling.patch | 2 +- ...rockchip-rk3588s-Add-USBDP-phy-nodes.patch | 6 +- ...p-rk3588-evb1-add-cpu-regulator-info.patch | 4 +- ...64-dts-rockchip-rk3588-evb1-add-USB3.patch | 14 ++-- ...rockchip-rk3588-rock5b-add-USB3-host.patch | 4 +- ...ip-rock5b-add-cpu-mem-regulator-info.patch | 2 +- ...ip-rk3588-rock5b-add-lower-USB3-port.patch | 6 +- ...chip-rk3588-rock5b-add-USB-C-support.patch | 22 +++---- ...64-dts-rockchip-rk3588s-add-rng-node.patch | 2 +- ...ts-rockchip-rk3588s-rng-use-scmi_clk.patch | 2 +- ...hip-enable-hwrng-for-rockchip-boards.patch | 2 +- 26 files changed, 430 insertions(+), 86 deletions(-) create mode 100644 target/linux/rockchip/patches-6.1/050-22-v6.8-arm64-dts-rockchip-Add-sfc-node-to-rk3588s.patch create mode 100644 target/linux/rockchip/patches-6.1/050-23-v6.8-arm64-dts-rockchip-Add-I2S2-M0-pin-definitions-to-rk3588s.patch create mode 100644 target/linux/rockchip/patches-6.1/050-24-v6.8-arm64-dts-rockchip-Add-UART9-M0-pin-definitions-to-rk3588.patch create mode 100644 target/linux/rockchip/patches-6.1/050-25-v6.8-arm64-dts-rockchip-Add-AV1-decoder-node-to-rk3588s.patch create mode 100644 target/linux/rockchip/patches-6.1/050-26-v6.8-arm64-dts-rockchip-Add-DFI-to-rk3588s.patch rename target/linux/rockchip/patches-6.1/{120-03-arm64-dts-rockchip-rk3588s-Add-USB3-host-controller.patch => 050-27-v6.8-arm64-dts-rockchip-rk3588s-Add-USB3-host-controller.patch} (82%) rename target/linux/rockchip/patches-6.1/{121-06-arm64-dts-rockchip-rk3588-evb1-add-ADC-buttons.patch => 051-07-v6.8-arm64-dts-rockchip-add-ADC-buttons-to-rk3588-evb1.patch} (81%) create mode 100644 target/linux/rockchip/patches-6.1/053-20-v6.8-arm64-dts-rockchip-Remove-duplicate-regulator-vcc3v3_wf.patch create mode 100644 target/linux/rockchip/patches-6.1/053-21-v6.8-arm64-dts-rockchip-Enable-UART6-on-rock-5b.patch create mode 100644 target/linux/rockchip/patches-6.1/053-22-v6.8-arm64-dts-rockchip-add-status-LED-to-rock-5b.patch diff --git a/target/linux/rockchip/patches-6.1/039-01-v6.4-usb-typec-tcpm-try-to-get-role-switch-from-tcpc-fwnode.patch b/target/linux/rockchip/patches-6.1/039-01-v6.4-usb-typec-tcpm-try-to-get-role-switch-from-tcpc-fwnode.patch index 88c6ae0868..a3f8a08795 100644 --- a/target/linux/rockchip/patches-6.1/039-01-v6.4-usb-typec-tcpm-try-to-get-role-switch-from-tcpc-fwnode.patch +++ b/target/linux/rockchip/patches-6.1/039-01-v6.4-usb-typec-tcpm-try-to-get-role-switch-from-tcpc-fwnode.patch @@ -43,7 +43,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c -@@ -6583,6 +6583,8 @@ struct tcpm_port *tcpm_register_port(str +@@ -6586,6 +6586,8 @@ struct tcpm_port *tcpm_register_port(str port->port_type = port->typec_caps.type; port->role_sw = usb_role_switch_get(port->dev); diff --git a/target/linux/rockchip/patches-6.1/050-22-v6.8-arm64-dts-rockchip-Add-sfc-node-to-rk3588s.patch b/target/linux/rockchip/patches-6.1/050-22-v6.8-arm64-dts-rockchip-Add-sfc-node-to-rk3588s.patch new file mode 100644 index 0000000000..00fd6d9c67 --- /dev/null +++ b/target/linux/rockchip/patches-6.1/050-22-v6.8-arm64-dts-rockchip-Add-sfc-node-to-rk3588s.patch @@ -0,0 +1,35 @@ +From 3eaf2abd11aa7f3b2fb04d60c64b2c756fe030eb Mon Sep 17 00:00:00 2001 +From: Muhammed Efe Cetin +Date: Mon, 9 Oct 2023 22:27:26 +0300 +Subject: [PATCH] arm64: dts: rockchip: Add sfc node to rk3588s + +Add SFC (SPI Flash) to RK3588S SOC. + +Reviewed-by: Dhruva Gole +Signed-off-by: Muhammed Efe Cetin +Link: https://lore.kernel.org/r/d36a64edfaede92ce2e158b0d9dc4f5998e019e3.1696878787.git.efectn@6tel.net +Signed-off-by: Heiko Stuebner +--- + arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +--- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +@@ -1415,6 +1415,17 @@ + }; + }; + ++ sfc: spi@fe2b0000 { ++ compatible = "rockchip,sfc"; ++ reg = <0x0 0xfe2b0000 0x0 0x4000>; ++ interrupts = ; ++ clocks = <&cru SCLK_SFC>, <&cru HCLK_SFC>; ++ clock-names = "clk_sfc", "hclk_sfc"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ status = "disabled"; ++ }; ++ + sdmmc: mmc@fe2c0000 { + compatible = "rockchip,rk3588-dw-mshc", "rockchip,rk3288-dw-mshc"; + reg = <0x0 0xfe2c0000 0x0 0x4000>; diff --git a/target/linux/rockchip/patches-6.1/050-23-v6.8-arm64-dts-rockchip-Add-I2S2-M0-pin-definitions-to-rk3588s.patch b/target/linux/rockchip/patches-6.1/050-23-v6.8-arm64-dts-rockchip-Add-I2S2-M0-pin-definitions-to-rk3588s.patch new file mode 100644 index 0000000000..25526ba23c --- /dev/null +++ b/target/linux/rockchip/patches-6.1/050-23-v6.8-arm64-dts-rockchip-Add-I2S2-M0-pin-definitions-to-rk3588s.patch @@ -0,0 +1,58 @@ +From bf012368bb0ab69167d49715789fac34dfcd457e Mon Sep 17 00:00:00 2001 +From: Ondrej Jirman +Date: Sun, 8 Oct 2023 15:04:59 +0200 +Subject: [PATCH] arm64: dts: rockchip: Add I2S2 M0 pin definitions to rk3588s + +This is used on Orange Pi 5 Plus. + +Signed-off-by: Ondrej Jirman +Link: https://lore.kernel.org/r/20231008130515.1155664-2-megi@xff.cz +Signed-off-by: Heiko Stuebner +--- + .../boot/dts/rockchip/rk3588s-pinctrl.dtsi | 35 +++++++++++++++++++ + 1 file changed, 35 insertions(+) + +--- a/arch/arm64/boot/dts/rockchip/rk3588s-pinctrl.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3588s-pinctrl.dtsi +@@ -1350,6 +1350,41 @@ + + i2s2 { + /omit-if-no-ref/ ++ i2s2m0_lrck: i2s2m0-lrck { ++ rockchip,pins = ++ /* i2s2m0_lrck */ ++ <2 RK_PC0 2 &pcfg_pull_none>; ++ }; ++ ++ /omit-if-no-ref/ ++ i2s2m0_mclk: i2s2m0-mclk { ++ rockchip,pins = ++ /* i2s2m0_mclk */ ++ <2 RK_PB6 2 &pcfg_pull_none>; ++ }; ++ ++ /omit-if-no-ref/ ++ i2s2m0_sclk: i2s2m0-sclk { ++ rockchip,pins = ++ /* i2s2m0_sclk */ ++ <2 RK_PB7 2 &pcfg_pull_none>; ++ }; ++ ++ /omit-if-no-ref/ ++ i2s2m0_sdi: i2s2m0-sdi { ++ rockchip,pins = ++ /* i2s2m0_sdi */ ++ <2 RK_PC3 2 &pcfg_pull_none>; ++ }; ++ ++ /omit-if-no-ref/ ++ i2s2m0_sdo: i2s2m0-sdo { ++ rockchip,pins = ++ /* i2s2m0_sdo */ ++ <4 RK_PC3 2 &pcfg_pull_none>; ++ }; ++ ++ /omit-if-no-ref/ + i2s2m1_lrck: i2s2m1-lrck { + rockchip,pins = + /* i2s2m1_lrck */ diff --git a/target/linux/rockchip/patches-6.1/050-24-v6.8-arm64-dts-rockchip-Add-UART9-M0-pin-definitions-to-rk3588.patch b/target/linux/rockchip/patches-6.1/050-24-v6.8-arm64-dts-rockchip-Add-UART9-M0-pin-definitions-to-rk3588.patch new file mode 100644 index 0000000000..4a9cb6ea39 --- /dev/null +++ b/target/linux/rockchip/patches-6.1/050-24-v6.8-arm64-dts-rockchip-Add-UART9-M0-pin-definitions-to-rk3588.patch @@ -0,0 +1,32 @@ +From 3d77a3e51b0faed820a8db985dce5af1cc4eae32 Mon Sep 17 00:00:00 2001 +From: Ondrej Jirman +Date: Sun, 8 Oct 2023 15:05:00 +0200 +Subject: [PATCH] arm64: dts: rockchip: Add UART9 M0 pin definitions to rk3588s + +This is used on Orange Pi 5 Plus. + +Signed-off-by: Ondrej Jirman +Link: https://lore.kernel.org/r/20231008130515.1155664-3-megi@xff.cz +Signed-off-by: Heiko Stuebner +--- + arch/arm64/boot/dts/rockchip/rk3588s-pinctrl.dtsi | 9 +++++++++ + 1 file changed, 9 insertions(+) + +--- a/arch/arm64/boot/dts/rockchip/rk3588s-pinctrl.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3588s-pinctrl.dtsi +@@ -3343,6 +3343,15 @@ + + uart9 { + /omit-if-no-ref/ ++ uart9m0_xfer: uart9m0-xfer { ++ rockchip,pins = ++ /* uart9_rx_m0 */ ++ <2 RK_PC4 10 &pcfg_pull_up>, ++ /* uart9_tx_m0 */ ++ <2 RK_PC2 10 &pcfg_pull_up>; ++ }; ++ ++ /omit-if-no-ref/ + uart9m1_xfer: uart9m1-xfer { + rockchip,pins = + /* uart9_rx_m1 */ diff --git a/target/linux/rockchip/patches-6.1/050-25-v6.8-arm64-dts-rockchip-Add-AV1-decoder-node-to-rk3588s.patch b/target/linux/rockchip/patches-6.1/050-25-v6.8-arm64-dts-rockchip-Add-AV1-decoder-node-to-rk3588s.patch new file mode 100644 index 0000000000..95d3e49c13 --- /dev/null +++ b/target/linux/rockchip/patches-6.1/050-25-v6.8-arm64-dts-rockchip-Add-AV1-decoder-node-to-rk3588s.patch @@ -0,0 +1,37 @@ +From dd6dc0c4c1265129c229e26917bf4de1d97ff91f Mon Sep 17 00:00:00 2001 +From: Benjamin Gaignard +Date: Fri, 6 Oct 2023 08:53:34 +0200 +Subject: [PATCH] arm64: dts: rockchip: Add AV1 decoder node to rk3588s + +Add node for AV1 video decoder. + +Signed-off-by: Benjamin Gaignard +Reviewed-by: Sebastian Reichel +Link: https://lore.kernel.org/r/20231006065334.8117-1-benjamin.gaignard@collabora.com +Signed-off-by: Heiko Stuebner +--- + arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +--- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +@@ -2306,6 +2306,19 @@ + #interrupt-cells = <2>; + }; + }; ++ ++ av1d: video-codec@fdc70000 { ++ compatible = "rockchip,rk3588-av1-vpu"; ++ reg = <0x0 0xfdc70000 0x0 0x800>; ++ interrupts = ; ++ interrupt-names = "vdpu"; ++ assigned-clocks = <&cru ACLK_AV1>, <&cru PCLK_AV1>; ++ assigned-clock-rates = <400000000>, <400000000>; ++ clocks = <&cru ACLK_AV1>, <&cru PCLK_AV1>; ++ clock-names = "aclk", "hclk"; ++ power-domains = <&power RK3588_PD_AV1>; ++ resets = <&cru SRST_A_AV1>, <&cru SRST_P_AV1>, <&cru SRST_A_AV1_BIU>, <&cru SRST_P_AV1_BIU>; ++ }; + }; + + #include "rk3588s-pinctrl.dtsi" diff --git a/target/linux/rockchip/patches-6.1/050-26-v6.8-arm64-dts-rockchip-Add-DFI-to-rk3588s.patch b/target/linux/rockchip/patches-6.1/050-26-v6.8-arm64-dts-rockchip-Add-DFI-to-rk3588s.patch new file mode 100644 index 0000000000..fa47f5905b --- /dev/null +++ b/target/linux/rockchip/patches-6.1/050-26-v6.8-arm64-dts-rockchip-Add-DFI-to-rk3588s.patch @@ -0,0 +1,50 @@ +From 5a6976b1040a2f99ab84eddbfa7cd072ac5d10fc Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Wed, 18 Oct 2023 08:17:14 +0200 +Subject: [PATCH] arm64: dts: rockchip: Add DFI to rk3588s + +The DFI unit can be used to measure DRAM utilization using perf. Add the +node to the device tree. The DFI needs a rockchip,pmu phandle to the pmu +containing registers for SDRAM configuration details. This is added in +this patch as well. + +Reviewed-by: Sebastian Reichel +Signed-off-by: Sascha Hauer +Link: https://lore.kernel.org/r/20231018061714.3553817-27-s.hauer@pengutronix.de +Signed-off-by: Heiko Stuebner +--- + arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +--- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +@@ -434,6 +434,11 @@ + status = "disabled"; + }; + ++ pmu1grf: syscon@fd58a000 { ++ compatible = "rockchip,rk3588-pmugrf", "syscon", "simple-mfd"; ++ reg = <0x0 0xfd58a000 0x0 0x10000>; ++ }; ++ + sys_grf: syscon@fd58c000 { + compatible = "rockchip,rk3588-sys-grf", "syscon"; + reg = <0x0 0xfd58c000 0x0 0x1000>; +@@ -1320,6 +1325,17 @@ + }; + }; + ++ dfi: dfi@fe060000 { ++ reg = <0x00 0xfe060000 0x00 0x10000>; ++ compatible = "rockchip,rk3588-dfi"; ++ interrupts = , ++ , ++ , ++ ; ++ interrupt-names = "ch0", "ch1", "ch2", "ch3"; ++ rockchip,pmu = <&pmu1grf>; ++ }; ++ + gmac1: ethernet@fe1c0000 { + compatible = "rockchip,rk3588-gmac", "snps,dwmac-4.20a"; + reg = <0x0 0xfe1c0000 0x0 0x10000>; diff --git a/target/linux/rockchip/patches-6.1/120-03-arm64-dts-rockchip-rk3588s-Add-USB3-host-controller.patch b/target/linux/rockchip/patches-6.1/050-27-v6.8-arm64-dts-rockchip-rk3588s-Add-USB3-host-controller.patch similarity index 82% rename from target/linux/rockchip/patches-6.1/120-03-arm64-dts-rockchip-rk3588s-Add-USB3-host-controller.patch rename to target/linux/rockchip/patches-6.1/050-27-v6.8-arm64-dts-rockchip-rk3588s-Add-USB3-host-controller.patch index 23c63a0359..93507e7efd 100644 --- a/target/linux/rockchip/patches-6.1/120-03-arm64-dts-rockchip-rk3588s-Add-USB3-host-controller.patch +++ b/target/linux/rockchip/patches-6.1/050-27-v6.8-arm64-dts-rockchip-rk3588s-Add-USB3-host-controller.patch @@ -1,6 +1,6 @@ -From 78432c7d9799a549c185482ac65f08d671098d4c Mon Sep 17 00:00:00 2001 +From bbd3778da16b3d448832b843f80bcde1aff26290 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel -Date: Tue, 18 Jul 2023 18:57:15 +0200 +Date: Fri, 20 Oct 2023 16:11:42 +0200 Subject: [PATCH] arm64: dts: rockchip: rk3588s: Add USB3 host controller RK3588 has three USB3 controllers. This adds the host-only controller, @@ -10,14 +10,16 @@ The other two are dual-role and using a different PHY that is not yet supported upstream. Signed-off-by: Sebastian Reichel +Link: https://lore.kernel.org/r/20231020150022.48725-4-sebastian.reichel@collabora.com +Signed-off-by: Greg Kroah-Hartman --- arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi -@@ -876,6 +876,27 @@ - status = "disabled"; +@@ -439,6 +439,27 @@ + reg = <0x0 0xfd58a000 0x0 0x10000>; }; + usb_host2_xhci: usb@fcd00000 { diff --git a/target/linux/rockchip/patches-6.1/121-06-arm64-dts-rockchip-rk3588-evb1-add-ADC-buttons.patch b/target/linux/rockchip/patches-6.1/051-07-v6.8-arm64-dts-rockchip-add-ADC-buttons-to-rk3588-evb1.patch similarity index 81% rename from target/linux/rockchip/patches-6.1/121-06-arm64-dts-rockchip-rk3588-evb1-add-ADC-buttons.patch rename to target/linux/rockchip/patches-6.1/051-07-v6.8-arm64-dts-rockchip-add-ADC-buttons-to-rk3588-evb1.patch index 36ebc61bf3..b8f3a2c69d 100644 --- a/target/linux/rockchip/patches-6.1/121-06-arm64-dts-rockchip-rk3588-evb1-add-ADC-buttons.patch +++ b/target/linux/rockchip/patches-6.1/051-07-v6.8-arm64-dts-rockchip-add-ADC-buttons-to-rk3588-evb1.patch @@ -1,12 +1,14 @@ -From 5ebbc365e6a30a5d0b36b82dc67cfc12b5aeaeb4 Mon Sep 17 00:00:00 2001 +From afa933c208e5ea9ddf8adb460e273b2b1aba85e5 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel -Date: Fri, 21 Jul 2023 15:47:00 +0200 -Subject: [PATCH] arm64: dts: rockchip: rk3588-evb1: add ADC buttons +Date: Thu, 5 Oct 2023 15:43:57 +0200 +Subject: [PATCH] arm64: dts: rockchip: add ADC buttons to rk3588-evb1 The Rockchip EVB1 has a couple of buttons connected via an ADC line. Let's add them to its devicetree. Signed-off-by: Sebastian Reichel +Link: https://lore.kernel.org/r/20231005134357.37171-1-sebastian.reichel@collabora.com +Signed-off-by: Heiko Stuebner --- .../boot/dts/rockchip/rk3588-evb1-v10.dts | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) @@ -19,9 +21,9 @@ Signed-off-by: Sebastian Reichel #include +#include #include - #include #include "rk3588.dtsi" -@@ -24,6 +25,38 @@ + +@@ -23,6 +24,38 @@ stdout-path = "serial2:1500000n8"; }; @@ -60,7 +62,7 @@ Signed-off-by: Sebastian Reichel backlight: backlight { compatible = "pwm-backlight"; power-supply = <&vcc12v_dcin>; -@@ -374,6 +407,11 @@ +@@ -286,6 +319,11 @@ status = "okay"; }; diff --git a/target/linux/rockchip/patches-6.1/053-20-v6.8-arm64-dts-rockchip-Remove-duplicate-regulator-vcc3v3_wf.patch b/target/linux/rockchip/patches-6.1/053-20-v6.8-arm64-dts-rockchip-Remove-duplicate-regulator-vcc3v3_wf.patch new file mode 100644 index 0000000000..ff341c1ec8 --- /dev/null +++ b/target/linux/rockchip/patches-6.1/053-20-v6.8-arm64-dts-rockchip-Remove-duplicate-regulator-vcc3v3_wf.patch @@ -0,0 +1,65 @@ +From 0002c377e862140ad65b67b8b9dbf086d4578f95 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tam=C3=A1s=20Sz=C5=B1cs?= +Date: Wed, 11 Oct 2023 18:18:05 +0000 +Subject: [PATCH] arm64: dts: rockchip: Remove duplicate regulator vcc3v3_wf + from rock-5b +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Regulator for VCC3V3_WF has been added as vcc3v3_pcie2x1l0 first. Clean this up. + +Fixes: 1c9a53ff7ece ("arm64: dts: rockchip: Add sdio node to rock-5b") +Signed-off-by: Tamás Szűcs +Link: https://lore.kernel.org/r/20231011181757.58047-1-tszucs@protonmail.ch +Signed-off-by: Heiko Stuebner +--- + .../boot/dts/rockchip/rk3588-rock-5b.dts | 23 +------------------ + 1 file changed, 1 insertion(+), 22 deletions(-) + +--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +@@ -114,21 +114,6 @@ + regulator-max-microvolt = <1100000>; + vin-supply = <&vcc5v0_sys>; + }; +- +- vcc3v3_wf: vcc3v3-wf-regulator { +- compatible = "regulator-fixed"; +- regulator-name = "vcc3v3_wf"; +- regulator-always-on; +- regulator-boot-on; +- regulator-min-microvolt = <3300000>; +- regulator-max-microvolt = <3300000>; +- enable-active-high; +- gpios = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>; +- pinctrl-names = "default"; +- pinctrl-0 = <&vcc3v3_wf_en>; +- startup-delay-us = <50000>; +- vin-supply = <&vcc5v0_sys>; +- }; + }; + + &combphy0_ps { +@@ -335,12 +320,6 @@ + rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; +- +- m2e { +- vcc3v3_wf_en: vcc3v3-wf-en { +- rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; +- }; +- }; + }; + + &pwm1 { +@@ -392,7 +371,7 @@ + sd-uhs-sdr25; + sd-uhs-sdr50; + sd-uhs-sdr104; +- vmmc-supply = <&vcc3v3_wf>; ++ vmmc-supply = <&vcc3v3_pcie2x1l0>; + vqmmc-supply = <&vcc_1v8_s3>; + pinctrl-names = "default"; + pinctrl-0 = <&sdiom0_pins>; diff --git a/target/linux/rockchip/patches-6.1/053-21-v6.8-arm64-dts-rockchip-Enable-UART6-on-rock-5b.patch b/target/linux/rockchip/patches-6.1/053-21-v6.8-arm64-dts-rockchip-Enable-UART6-on-rock-5b.patch new file mode 100644 index 0000000000..8a00ee0f67 --- /dev/null +++ b/target/linux/rockchip/patches-6.1/053-21-v6.8-arm64-dts-rockchip-Enable-UART6-on-rock-5b.patch @@ -0,0 +1,32 @@ +From a6169ab369236f15c79b45037074a2567d30b037 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tam=C3=A1s=20Sz=C5=B1cs?= +Date: Fri, 13 Oct 2023 23:51:53 +0200 +Subject: [PATCH] arm64: dts: rockchip: Enable UART6 on rock-5b +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Enable UART lines on Radxa ROCK 5 Model B M.2 Key E. + +Signed-off-by: Tamás Szűcs +Link: https://lore.kernel.org/r/20231013215208.81345-1-szucst@iit.uni-miskolc.hu +Signed-off-by: Heiko Stuebner +--- + arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +@@ -378,6 +378,12 @@ + status = "okay"; + }; + ++&uart6 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&uart6m1_xfer &uart6m1_ctsn &uart6m1_rtsn>; ++ status = "okay"; ++}; ++ + &spi2 { + status = "okay"; + assigned-clocks = <&cru CLK_SPI2>; diff --git a/target/linux/rockchip/patches-6.1/053-22-v6.8-arm64-dts-rockchip-add-status-LED-to-rock-5b.patch b/target/linux/rockchip/patches-6.1/053-22-v6.8-arm64-dts-rockchip-add-status-LED-to-rock-5b.patch new file mode 100644 index 0000000000..80fcee6b01 --- /dev/null +++ b/target/linux/rockchip/patches-6.1/053-22-v6.8-arm64-dts-rockchip-add-status-LED-to-rock-5b.patch @@ -0,0 +1,57 @@ +From 7952cbbda301f7d297c6ac761f9dfafb90205358 Mon Sep 17 00:00:00 2001 +From: Sebastian Reichel +Date: Thu, 5 Oct 2023 15:40:37 +0200 +Subject: [PATCH] arm64: dts: rockchip: add status LED to rock-5b + +Describe the Rock 5B status LED in its device tree. + +Signed-off-by: Sebastian Reichel +Link: https://lore.kernel.org/r/20231005134037.33231-1-sebastian.reichel@collabora.com +Signed-off-by: Heiko Stuebner +--- + .../boot/dts/rockchip/rk3588-rock-5b.dts | 20 +++++++++++++++++++ + 1 file changed, 20 insertions(+) + +--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +@@ -3,6 +3,7 @@ + /dts-v1/; + + #include ++#include + #include "rk3588.dtsi" + + / { +@@ -37,6 +38,19 @@ + pinctrl-0 = <&hp_detect>; + }; + ++ leds { ++ compatible = "gpio-leds"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&led_rgb_b>; ++ ++ led_rgb_b { ++ function = LED_FUNCTION_STATUS; ++ color = ; ++ gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "heartbeat"; ++ }; ++ }; ++ + fan: pwm-fan { + compatible = "pwm-fan"; + cooling-levels = <0 95 145 195 255>; +@@ -285,6 +299,12 @@ + }; + }; + ++ leds { ++ led_rgb_b: led-rgb-b { ++ rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ }; ++ + sound { + hp_detect: hp-detect { + rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>; diff --git a/target/linux/rockchip/patches-6.1/100-rockchip-use-system-LED-for-OpenWrt.patch b/target/linux/rockchip/patches-6.1/100-rockchip-use-system-LED-for-OpenWrt.patch index e94287b562..0955438b7a 100644 --- a/target/linux/rockchip/patches-6.1/100-rockchip-use-system-LED-for-OpenWrt.patch +++ b/target/linux/rockchip/patches-6.1/100-rockchip-use-system-LED-for-OpenWrt.patch @@ -338,16 +338,7 @@ Signed-off-by: David Bauer }; --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts -@@ -3,6 +3,8 @@ - /dts-v1/; - - #include -+#include -+#include - #include "rk3588.dtsi" - - / { -@@ -14,6 +16,11 @@ +@@ -15,6 +15,11 @@ mmc1 = &sdmmc; mmc2 = &sdio; serial2 = &uart2; @@ -359,37 +350,20 @@ Signed-off-by: David Bauer }; chosen { -@@ -96,6 +103,17 @@ - vin-supply = <&vcc5v0_sys>; - }; +@@ -43,11 +48,9 @@ + pinctrl-names = "default"; + pinctrl-0 = <&led_rgb_b>; -+ gpio-leds { -+ compatible = "gpio-leds"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&status_led_pin>; -+ -+ status_led: led-status { -+ gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; +- led_rgb_b { +- function = LED_FUNCTION_STATUS; +- color = ; ++ status_led: led_rgb_b { + label = "blue:status"; -+ }; -+ }; -+ - vcc5v0_sys: vcc5v0-sys-regulator { - compatible = "regulator-fixed"; - regulator-name = "vcc5v0_sys"; -@@ -300,6 +318,12 @@ + gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; +- linux,default-trigger = "heartbeat"; }; }; -+ gpio-leds { -+ status_led_pin: led-status-pin { -+ rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; -+ }; -+ - sound { - hp_detect: hp-detect { - rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>; --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts @@ -9,12 +9,17 @@ diff --git a/target/linux/rockchip/patches-6.1/103-arm64-dts-rockchip-lower-mmc-speed.patch b/target/linux/rockchip/patches-6.1/103-arm64-dts-rockchip-lower-mmc-speed.patch index 512e1fa446..b784bf1fc2 100644 --- a/target/linux/rockchip/patches-6.1/103-arm64-dts-rockchip-lower-mmc-speed.patch +++ b/target/linux/rockchip/patches-6.1/103-arm64-dts-rockchip-lower-mmc-speed.patch @@ -36,7 +36,7 @@ Signed-off-by: David Bauer }; --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts -@@ -382,8 +382,7 @@ +@@ -360,8 +360,7 @@ no-sd; non-removable; max-frequency = <200000000>; @@ -46,7 +46,7 @@ Signed-off-by: David Bauer status = "okay"; }; -@@ -394,9 +393,8 @@ +@@ -372,9 +371,8 @@ bus-width = <4>; cap-mmc-highspeed; cap-sd-highspeed; diff --git a/target/linux/rockchip/patches-6.1/113-01-usb-dwc3-add-optional-PHY-interface-clocks.patch b/target/linux/rockchip/patches-6.1/113-01-usb-dwc3-add-optional-PHY-interface-clocks.patch index ec84942f06..65007d9cf9 100644 --- a/target/linux/rockchip/patches-6.1/113-01-usb-dwc3-add-optional-PHY-interface-clocks.patch +++ b/target/linux/rockchip/patches-6.1/113-01-usb-dwc3-add-optional-PHY-interface-clocks.patch @@ -15,7 +15,7 @@ Signed-off-by: Sebastian Reichel --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c -@@ -821,8 +821,20 @@ static int dwc3_clk_enable(struct dwc3 * +@@ -858,8 +858,20 @@ static int dwc3_clk_enable(struct dwc3 * if (ret) goto disable_ref_clk; @@ -36,7 +36,7 @@ Signed-off-by: Sebastian Reichel disable_ref_clk: clk_disable_unprepare(dwc->ref_clk); disable_bus_clk: -@@ -832,6 +844,8 @@ disable_bus_clk: +@@ -869,6 +881,8 @@ disable_bus_clk: static void dwc3_clk_disable(struct dwc3 *dwc) { @@ -45,7 +45,7 @@ Signed-off-by: Sebastian Reichel clk_disable_unprepare(dwc->susp_clk); clk_disable_unprepare(dwc->ref_clk); clk_disable_unprepare(dwc->bus_clk); -@@ -1838,6 +1852,18 @@ static int dwc3_probe(struct platform_de +@@ -1875,6 +1889,18 @@ static int dwc3_probe(struct platform_de goto put_usb_psy; } } diff --git a/target/linux/rockchip/patches-6.1/113-02-usb-typec-tcpm-avoid-graph-warning.patch b/target/linux/rockchip/patches-6.1/113-02-usb-typec-tcpm-avoid-graph-warning.patch index 7ff890dfef..85b0016517 100644 --- a/target/linux/rockchip/patches-6.1/113-02-usb-typec-tcpm-avoid-graph-warning.patch +++ b/target/linux/rockchip/patches-6.1/113-02-usb-typec-tcpm-avoid-graph-warning.patch @@ -28,7 +28,7 @@ Signed-off-by: Sebastian Reichel --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c -@@ -6582,9 +6582,9 @@ struct tcpm_port *tcpm_register_port(str +@@ -6585,9 +6585,9 @@ struct tcpm_port *tcpm_register_port(str port->partner_desc.identity = &port->partner_ident; port->port_type = port->typec_caps.type; 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 666d357e22..cdc3cafdcd 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 = , -@@ -439,6 +881,16 @@ +@@ -465,6 +907,16 @@ reg = <0x0 0xfd58c000 0x0 0x1000>; }; diff --git a/target/linux/rockchip/patches-6.1/120-04-arm64-dts-rockchip-rk3588s-Add-USBDP-phy-nodes.patch b/target/linux/rockchip/patches-6.1/120-04-arm64-dts-rockchip-rk3588s-Add-USBDP-phy-nodes.patch index a197a931d8..8da34815f3 100644 --- a/target/linux/rockchip/patches-6.1/120-04-arm64-dts-rockchip-rk3588s-Add-USBDP-phy-nodes.patch +++ b/target/linux/rockchip/patches-6.1/120-04-arm64-dts-rockchip-rk3588s-Add-USBDP-phy-nodes.patch @@ -91,7 +91,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 -@@ -927,6 +927,37 @@ +@@ -932,6 +932,37 @@ reg = <0x0 0xfd5c4000 0x0 0x100>; }; @@ -129,7 +129,7 @@ Signed-off-by: Sebastian Reichel usb2phy2_grf: syscon@fd5d8000 { compatible = "rockchip,rk3588-usb2phy-grf", "syscon", "simple-mfd"; reg = <0x0 0xfd5d8000 0x0 0x4000>; -@@ -952,6 +983,17 @@ +@@ -957,6 +988,17 @@ }; }; @@ -147,7 +147,7 @@ Signed-off-by: Sebastian Reichel usb2phy3_grf: syscon@fd5dc000 { compatible = "rockchip,rk3588-usb2phy-grf", "syscon", "simple-mfd"; reg = <0x0 0xfd5dc000 0x0 0x4000>; -@@ -2661,6 +2703,37 @@ +@@ -2688,6 +2730,37 @@ #dma-cells = <1>; }; diff --git a/target/linux/rockchip/patches-6.1/121-01-arm64-dts-rockchip-rk3588-evb1-add-cpu-regulator-info.patch b/target/linux/rockchip/patches-6.1/121-01-arm64-dts-rockchip-rk3588-evb1-add-cpu-regulator-info.patch index be8ac804af..0d603a1f18 100644 --- a/target/linux/rockchip/patches-6.1/121-01-arm64-dts-rockchip-rk3588-evb1-add-cpu-regulator-info.patch +++ b/target/linux/rockchip/patches-6.1/121-01-arm64-dts-rockchip-rk3588-evb1-add-cpu-regulator-info.patch @@ -13,7 +13,7 @@ Signed-off-by: Sebastian Reichel --- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts -@@ -176,6 +176,21 @@ +@@ -209,6 +209,21 @@ cpu-supply = <&vdd_cpu_lit_s0>; }; @@ -35,7 +35,7 @@ Signed-off-by: Sebastian Reichel &gmac0 { clock_in_out = "output"; phy-handle = <&rgmii_phy>; -@@ -924,6 +939,10 @@ +@@ -962,6 +977,10 @@ status = "okay"; }; diff --git a/target/linux/rockchip/patches-6.1/121-05-arm64-dts-rockchip-rk3588-evb1-add-USB3.patch b/target/linux/rockchip/patches-6.1/121-05-arm64-dts-rockchip-rk3588-evb1-add-USB3.patch index 95e0688948..bbc5344d39 100644 --- a/target/linux/rockchip/patches-6.1/121-05-arm64-dts-rockchip-rk3588-evb1-add-USB3.patch +++ b/target/linux/rockchip/patches-6.1/121-05-arm64-dts-rockchip-rk3588-evb1-add-USB3.patch @@ -13,15 +13,15 @@ Signed-off-by: Sebastian Reichel --- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts -@@ -8,6 +8,7 @@ - +@@ -9,6 +9,7 @@ #include + #include #include +#include #include "rk3588.dtsi" / { -@@ -134,6 +135,18 @@ +@@ -167,6 +168,18 @@ regulator-max-microvolt = <5000000>; vin-supply = <&vcc5v0_usbdcin>; }; @@ -40,7 +40,7 @@ Signed-off-by: Sebastian Reichel }; &combphy0_ps { -@@ -209,6 +222,56 @@ +@@ -242,6 +255,56 @@ &i2c2 { status = "okay"; @@ -97,7 +97,7 @@ Signed-off-by: Sebastian Reichel hym8563: rtc@51 { compatible = "haoyu,hym8563"; reg = <0x51>; -@@ -295,6 +358,16 @@ +@@ -328,6 +391,16 @@ rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; }; }; @@ -114,7 +114,7 @@ Signed-off-by: Sebastian Reichel }; &pwm2 { -@@ -921,6 +994,22 @@ +@@ -959,6 +1032,22 @@ status = "okay"; }; @@ -137,7 +137,7 @@ Signed-off-by: Sebastian Reichel &u2phy2 { status = "okay"; }; -@@ -963,3 +1052,58 @@ +@@ -1001,3 +1090,58 @@ &usb_host1_ohci { status = "okay"; }; diff --git a/target/linux/rockchip/patches-6.1/123-04-arm64-dts-rockchip-rk3588-rock5b-add-USB3-host.patch b/target/linux/rockchip/patches-6.1/123-04-arm64-dts-rockchip-rk3588-rock5b-add-USB3-host.patch index 75acbef02e..0b485bfac1 100644 --- a/target/linux/rockchip/patches-6.1/123-04-arm64-dts-rockchip-rk3588-rock5b-add-USB3-host.patch +++ b/target/linux/rockchip/patches-6.1/123-04-arm64-dts-rockchip-rk3588-rock5b-add-USB3-host.patch @@ -17,7 +17,7 @@ Signed-off-by: Sebastian Reichel --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts -@@ -157,6 +157,10 @@ +@@ -141,6 +141,10 @@ status = "okay"; }; @@ -28,7 +28,7 @@ Signed-off-by: Sebastian Reichel &cpu_b0 { cpu-supply = <&vdd_cpu_big0_s0>; }; -@@ -784,3 +788,7 @@ +@@ -768,3 +772,7 @@ &usb_host1_ohci { status = "okay"; }; diff --git a/target/linux/rockchip/patches-6.1/123-05-arm64-dts-rockchip-rock5b-add-cpu-mem-regulator-info.patch b/target/linux/rockchip/patches-6.1/123-05-arm64-dts-rockchip-rock5b-add-cpu-mem-regulator-info.patch index 99f8436c18..c7f731a40d 100644 --- a/target/linux/rockchip/patches-6.1/123-05-arm64-dts-rockchip-rock5b-add-cpu-mem-regulator-info.patch +++ b/target/linux/rockchip/patches-6.1/123-05-arm64-dts-rockchip-rock5b-add-cpu-mem-regulator-info.patch @@ -13,7 +13,7 @@ Signed-off-by: Sebastian Reichel --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts -@@ -163,34 +163,42 @@ +@@ -147,34 +147,42 @@ &cpu_b0 { cpu-supply = <&vdd_cpu_big0_s0>; diff --git a/target/linux/rockchip/patches-6.1/123-06-arm64-dts-rockchip-rk3588-rock5b-add-lower-USB3-port.patch b/target/linux/rockchip/patches-6.1/123-06-arm64-dts-rockchip-rk3588-rock5b-add-lower-USB3-port.patch index 1b26953256..3ac2de06bf 100644 --- a/target/linux/rockchip/patches-6.1/123-06-arm64-dts-rockchip-rk3588-rock5b-add-lower-USB3-port.patch +++ b/target/linux/rockchip/patches-6.1/123-06-arm64-dts-rockchip-rk3588-rock5b-add-lower-USB3-port.patch @@ -13,7 +13,7 @@ Signed-off-by: Sebastian Reichel --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts -@@ -762,6 +762,14 @@ +@@ -746,6 +746,14 @@ status = "okay"; }; @@ -28,7 +28,7 @@ Signed-off-by: Sebastian Reichel &u2phy2 { status = "okay"; }; -@@ -781,6 +789,14 @@ +@@ -765,6 +773,14 @@ status = "okay"; }; @@ -43,7 +43,7 @@ Signed-off-by: Sebastian Reichel &usb_host0_ehci { status = "okay"; }; -@@ -797,6 +813,10 @@ +@@ -781,6 +797,10 @@ status = "okay"; }; diff --git a/target/linux/rockchip/patches-6.1/123-07-arm64-dts-rockchip-rk3588-rock5b-add-USB-C-support.patch b/target/linux/rockchip/patches-6.1/123-07-arm64-dts-rockchip-rk3588-rock5b-add-USB-C-support.patch index f6892a4664..b4fdd91ad2 100644 --- a/target/linux/rockchip/patches-6.1/123-07-arm64-dts-rockchip-rk3588-rock5b-add-USB-C-support.patch +++ b/target/linux/rockchip/patches-6.1/123-07-arm64-dts-rockchip-rk3588-rock5b-add-USB-C-support.patch @@ -1,4 +1,4 @@ -From 691e7aaeca265abd4fdadef3e407c16bebec0ca6 Mon Sep 17 00:00:00 2001 +From 5c242dd9ee6e94c1f19248a48792ad0ce0bd7b4a Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Tue, 25 Jul 2023 18:35:56 +0200 Subject: [PATCH] arm64: dts: rockchip: rk3588-rock5b: add USB-C support @@ -13,15 +13,15 @@ Signed-off-by: Sebastian Reichel --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts -@@ -5,6 +5,7 @@ +@@ -4,6 +4,7 @@ + #include #include - #include +#include #include "rk3588.dtsi" / { -@@ -52,6 +53,15 @@ +@@ -62,6 +63,15 @@ #cooling-cells = <2>; }; @@ -37,7 +37,7 @@ Signed-off-by: Sebastian Reichel vcc3v3_pcie2x1l0: vcc3v3-pcie2x1l0-regulator { compatible = "regulator-fixed"; enable-active-high; -@@ -121,6 +131,7 @@ +@@ -120,6 +130,7 @@ regulator-boot-on; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; @@ -45,7 +45,7 @@ Signed-off-by: Sebastian Reichel }; vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator { -@@ -241,6 +252,61 @@ +@@ -225,6 +236,61 @@ }; }; @@ -107,7 +107,7 @@ Signed-off-by: Sebastian Reichel &i2c6 { status = "okay"; -@@ -370,6 +436,10 @@ +@@ -354,6 +420,10 @@ vcc5v0_host_en: vcc5v0-host-en { rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; }; @@ -116,9 +116,9 @@ Signed-off-by: Sebastian Reichel + rockchip,pins = <3 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>; + }; }; + }; - m2e { -@@ -762,6 +832,14 @@ +@@ -746,6 +816,14 @@ status = "okay"; }; @@ -133,7 +133,7 @@ Signed-off-by: Sebastian Reichel &u2phy1 { status = "okay"; }; -@@ -797,6 +875,33 @@ +@@ -781,6 +859,33 @@ status = "okay"; }; @@ -167,7 +167,7 @@ Signed-off-by: Sebastian Reichel &usb_host0_ehci { status = "okay"; }; -@@ -805,6 +910,20 @@ +@@ -789,6 +894,20 @@ status = "okay"; }; 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 a50decef45..57fc74ad76 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 -@@ -2003,6 +2003,17 @@ +@@ -2030,6 +2030,17 @@ 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 87c3d10599..0377da1894 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 -@@ -2007,7 +2007,7 @@ +@@ -2034,7 +2034,7 @@ compatible = "rockchip,trngv1"; reg = <0x0 0xfe378000 0x0 0x200>; interrupts = ; diff --git a/target/linux/rockchip/patches-6.1/801-07-arm64-dts-rockchip-enable-hwrng-for-rockchip-boards.patch b/target/linux/rockchip/patches-6.1/801-07-arm64-dts-rockchip-enable-hwrng-for-rockchip-boards.patch index 5f016455f7..8d6c651db3 100644 --- a/target/linux/rockchip/patches-6.1/801-07-arm64-dts-rockchip-enable-hwrng-for-rockchip-boards.patch +++ b/target/linux/rockchip/patches-6.1/801-07-arm64-dts-rockchip-enable-hwrng-for-rockchip-boards.patch @@ -52,7 +52,7 @@ status = "okay"; --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts -@@ -453,6 +453,10 @@ +@@ -431,6 +431,10 @@ status = "okay"; };