diff --git a/target/linux/rockchip/patches-6.1/051-08-v6.8-arm64-dts-rockchip-mark-system-power-controller-on-rk3588.patch b/target/linux/rockchip/patches-6.1/051-08-v6.8-arm64-dts-rockchip-mark-system-power-controller-on-rk3588.patch new file mode 100644 index 0000000000..1299ff3679 --- /dev/null +++ b/target/linux/rockchip/patches-6.1/051-08-v6.8-arm64-dts-rockchip-mark-system-power-controller-on-rk3588.patch @@ -0,0 +1,25 @@ +From fc4657971be31ae679e2bbeee2fb8e93a7a063eb Mon Sep 17 00:00:00 2001 +From: Sebastian Reichel +Date: Wed, 17 Jan 2024 20:14:48 +0100 +Subject: [PATCH] arm64: dts: rockchip: mark system power controller on rk3588-evb1 + +Mark the primary PMIC as system-power-controller, so that the +system properly shuts down on poweroff. + +Signed-off-by: Sebastian Reichel +Link: https://lore.kernel.org/r/20240117191555.86138-1-sebastian.reichel@collabora.com +Signed-off-by: Heiko Stuebner +--- + arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts +@@ -352,6 +352,7 @@ + <&rk806_dvs2_null>, <&rk806_dvs3_null>; + pinctrl-names = "default"; + spi-max-frequency = <1000000>; ++ system-power-controller; + + vcc1-supply = <&vcc5v0_sys>; + vcc2-supply = <&vcc5v0_sys>; diff --git a/target/linux/rockchip/patches-6.1/053-24-v6.9-arm64-dts-rockchip-support-poweroff-on-the-rock-5b.patch b/target/linux/rockchip/patches-6.1/053-24-v6.9-arm64-dts-rockchip-support-poweroff-on-the-rock-5b.patch new file mode 100644 index 0000000000..bb0d975e4d --- /dev/null +++ b/target/linux/rockchip/patches-6.1/053-24-v6.9-arm64-dts-rockchip-support-poweroff-on-the-rock-5b.patch @@ -0,0 +1,31 @@ +From 7738f551173540b3daa63a91b384b167eacd24fd Mon Sep 17 00:00:00 2001 +From: John Clark +Date: Mon, 25 Dec 2023 22:28:19 +0000 +Subject: [PATCH] arm64: dts: rockchip: support poweroff on the rock-5b + +Allow the rock-5b to poweroff its pmic. When issuing a "shutdown -h now" +on the rock-5b it reboots instead. Defining 'system-power-controller' +allows the rk806 to power down. + +Commit c699fbfdfd54 ("arm64: dts: rockchip: Support poweroff on +NanoPC-T6") similarly resolves this issue for the nanopc-t6. + +Signed-off-by: John Clark +Reviewed-by: Sebastian Reichel +Link: https://lore.kernel.org/r/20231225222859.17153-1-inindev@gmail.com +Signed-off-by: Heiko Stuebner +--- + arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +@@ -428,6 +428,8 @@ + pinctrl-0 = <&pmic_pins>, <&rk806_dvs1_null>, + <&rk806_dvs2_null>, <&rk806_dvs3_null>; + ++ system-power-controller; ++ + vcc1-supply = <&vcc5v0_sys>; + vcc2-supply = <&vcc5v0_sys>; + vcc3-supply = <&vcc5v0_sys>; diff --git a/target/linux/rockchip/patches-6.1/053-25-v6.9-arm64-dts-rockchip-correct-gpio_pwrctrl1-typo-on-rock-5b.patch b/target/linux/rockchip/patches-6.1/053-25-v6.9-arm64-dts-rockchip-correct-gpio_pwrctrl1-typo-on-rock-5b.patch new file mode 100644 index 0000000000..8aa41a9f79 --- /dev/null +++ b/target/linux/rockchip/patches-6.1/053-25-v6.9-arm64-dts-rockchip-correct-gpio_pwrctrl1-typo-on-rock-5b.patch @@ -0,0 +1,27 @@ +From aed6514c4e3aee843385ded4c5ee0921b51c30fa Mon Sep 17 00:00:00 2001 +From: John Clark +Date: Mon, 25 Dec 2023 22:28:20 +0000 +Subject: [PATCH] arm64: dts: rockchip: correct gpio_pwrctrl1 typo on rock-5b + +Both rk806_dvs1_null and rk806_dvs2_null duplicate gpio_pwrctrl2 and +gpio_pwrctrl1 is not set. This patch sets gpio_pwrctrl1. + +Signed-off-by: John Clark +Reviewed-by: Sebastian Reichel +Link: https://lore.kernel.org/r/20231225222859.17153-2-inindev@gmail.com +Signed-off-by: Heiko Stuebner +--- + arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +@@ -450,7 +450,7 @@ + #gpio-cells = <2>; + + rk806_dvs1_null: dvs1-null-pins { +- pins = "gpio_pwrctrl2"; ++ pins = "gpio_pwrctrl1"; + function = "pin_fun0"; + }; + diff --git a/target/linux/rockchip/patches-6.1/053-26-v6.9-arm64-dts-rockchip-add-rfkill-node-for-M-2-Key-E-WiFi-on-.patch b/target/linux/rockchip/patches-6.1/053-26-v6.9-arm64-dts-rockchip-add-rfkill-node-for-M-2-Key-E-WiFi-on-.patch new file mode 100644 index 0000000000..48063563b2 --- /dev/null +++ b/target/linux/rockchip/patches-6.1/053-26-v6.9-arm64-dts-rockchip-add-rfkill-node-for-M-2-Key-E-WiFi-on-.patch @@ -0,0 +1,34 @@ +From 82d40b141a4c7ab6608a84a5ce0c58b747cb7163 Mon Sep 17 00:00:00 2001 +From: Alexey Charkov +Date: Sun, 7 Jan 2024 00:26:45 +0400 +Subject: [PATCH] arm64: dts: rockchip: add rfkill node for M.2 Key E WiFi on rock-5b + +By default the GPIO pin that connects to the WiFi enable signal +inside the M.2 Key E slot is driven low, resulting in impossibility +to connect to any network. Add a DT node to expose it as an RFKILL +device, which lets the WiFi driver or userspace toggle it as +required. + +Signed-off-by: Alexey Charkov +Link: https://lore.kernel.org/r/20240106202650.22310-1-alchark@gmail.com +Signed-off-by: Heiko Stuebner +--- + arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +@@ -59,6 +59,13 @@ + #cooling-cells = <2>; + }; + ++ rfkill { ++ compatible = "rfkill-gpio"; ++ label = "rfkill-pcie-wlan"; ++ radio-type = "wlan"; ++ shutdown-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>; ++ }; ++ + vcc3v3_pcie2x1l0: vcc3v3-pcie2x1l0-regulator { + compatible = "regulator-fixed"; + enable-active-high; diff --git a/target/linux/rockchip/patches-6.1/054-05-v6.9-arm64-dts-rockchip-nanopc-t6-sdmmc-beautification.patch b/target/linux/rockchip/patches-6.1/054-05-v6.9-arm64-dts-rockchip-nanopc-t6-sdmmc-beautification.patch new file mode 100644 index 0000000000..4d9238a6e6 --- /dev/null +++ b/target/linux/rockchip/patches-6.1/054-05-v6.9-arm64-dts-rockchip-nanopc-t6-sdmmc-beautification.patch @@ -0,0 +1,33 @@ +From 9e1faff1cbc877903d019a7943d37ddc5042704d Mon Sep 17 00:00:00 2001 +From: John Clark +Date: Thu, 28 Dec 2023 17:29:35 +0000 +Subject: arm64: dts: rockchip: nanopc-t6 sdmmc beautification + +drop max-frequency = <200000000> as it is already defined in rk3588s.dtsi +order no-sdio & no-mmc properties while we are here + +Signed-off-by: John Clark +Link: https://lore.kernel.org/r/20231228173011.2863-1-inindev@gmail.com +Signed-off-by: Heiko Stuebner +--- + arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts +@@ -537,13 +537,12 @@ + }; + + &sdmmc { +- max-frequency = <200000000>; +- no-sdio; +- no-mmc; + bus-width = <4>; + cap-mmc-highspeed; + cap-sd-highspeed; + disable-wp; ++ no-mmc; ++ no-sdio; + sd-uhs-sdr104; + vmmc-supply = <&vcc_3v3_s3>; + vqmmc-supply = <&vccio_sd_s0>; diff --git a/target/linux/rockchip/patches-6.1/054-06-v6.9-arm64-dts-rockchip-correct-gpio_pwrctrl1-typo-on-nanopc-t.patch b/target/linux/rockchip/patches-6.1/054-06-v6.9-arm64-dts-rockchip-correct-gpio_pwrctrl1-typo-on-nanopc-t.patch new file mode 100644 index 0000000000..376094ef7c --- /dev/null +++ b/target/linux/rockchip/patches-6.1/054-06-v6.9-arm64-dts-rockchip-correct-gpio_pwrctrl1-typo-on-nanopc-t.patch @@ -0,0 +1,26 @@ +From 24559788384916041a0bbf54c32e2a16b612d247 Mon Sep 17 00:00:00 2001 +From: John Clark +Date: Mon, 25 Dec 2023 22:32:16 +0000 +Subject: [PATCH] arm64: dts: rockchip: correct gpio_pwrctrl1 typo on nanopc-t6 + +Both rk806_dvs1_null and rk806_dvs2_null duplicate gpio_pwrctrl2 and +gpio_pwrctrl1 is not set. This patch sets gpio_pwrctrl1. + +Signed-off-by: John Clark +Link: https://lore.kernel.org/r/20231225223226.17690-1-inindev@gmail.com +Signed-off-by: Heiko Stuebner +--- + arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts +@@ -591,7 +591,7 @@ + #gpio-cells = <2>; + + rk806_dvs1_null: dvs1-null-pins { +- pins = "gpio_pwrctrl2"; ++ pins = "gpio_pwrctrl1"; + function = "pin_fun0"; + }; + diff --git a/target/linux/rockchip/patches-6.1/054-07-v6.9-arm64-dts-rockchip-enable-NanoPC-T6-MiniPCIe-power.patch b/target/linux/rockchip/patches-6.1/054-07-v6.9-arm64-dts-rockchip-enable-NanoPC-T6-MiniPCIe-power.patch new file mode 100644 index 0000000000..f48c3b50bb --- /dev/null +++ b/target/linux/rockchip/patches-6.1/054-07-v6.9-arm64-dts-rockchip-enable-NanoPC-T6-MiniPCIe-power.patch @@ -0,0 +1,57 @@ +From d235e65adf00f6db09331874c5a987b7fe18023b Mon Sep 17 00:00:00 2001 +From: Hugh Cole-Baker +Date: Tue, 9 Jan 2024 20:27:28 +0000 +Subject: [PATCH] arm64: dts: rockchip: enable NanoPC-T6 MiniPCIe power + +The NanoPC-T6 has a Mini PCIe slot intended to be used for a 4G or LTE +modem. This slot has no PCIe functionality, only USB 2.0 pins are wired +to the SoC, and USIM pins are wired to a SIM card slot on the board. +Define the 3.3v supply for the slot so it can be used. + +Signed-off-by: Hugh Cole-Baker +Link: https://lore.kernel.org/r/20240109202729.54292-1-sigmaris@gmail.com +Signed-off-by: Heiko Stuebner +--- + arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts +@@ -160,6 +160,18 @@ + regulator-max-microvolt = <3300000>; + vin-supply = <&vcc5v0_sys>; + }; ++ ++ vdd_4g_3v3: vdd-4g-3v3-regulator { ++ compatible = "regulator-fixed"; ++ enable-active-high; ++ gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pin_4g_lte_pwren>; ++ regulator-name = "vdd_4g_3v3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ vin-supply = <&vcc5v0_sys>; ++ }; + }; + + &combphy0_ps { +@@ -505,6 +517,10 @@ + }; + + usb { ++ pin_4g_lte_pwren: 4g-lte-pwren { ++ rockchip,pins = <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ + typec5v_pwren: typec5v-pwren { + rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; + }; +@@ -885,6 +901,7 @@ + }; + + &u2phy2_host { ++ phy-supply = <&vdd_4g_3v3>; + status = "okay"; + }; + diff --git a/target/linux/rockchip/patches-6.1/054-08-v6.9-arm64-dts-rockchip-fix-nanopc-t6-sdmmc-regulator.patch b/target/linux/rockchip/patches-6.1/054-08-v6.9-arm64-dts-rockchip-fix-nanopc-t6-sdmmc-regulator.patch new file mode 100644 index 0000000000..8fe9b34658 --- /dev/null +++ b/target/linux/rockchip/patches-6.1/054-08-v6.9-arm64-dts-rockchip-fix-nanopc-t6-sdmmc-regulator.patch @@ -0,0 +1,44 @@ +From 6cb02674a061e4ef4f437ab60c91038d4c0d85ef Mon Sep 17 00:00:00 2001 +From: John Clark +Date: Tue, 2 Jan 2024 02:40:53 +0000 +Subject: [PATCH] arm64: dts: rockchip: fix nanopc-t6 sdmmc regulator + +sdmmc on the nanopc-t6 is powered by vcc3v3_sd_s0, not vcc_3v3_s3 +add the vcc3v3_sd_s0 regulator, and control it with gpio4_a5 + +Signed-off-by: John Clark +Link: https://lore.kernel.org/r/20240102024054.1030313-1-inindev@gmail.com +Signed-off-by: Heiko Stuebner +--- + arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts +@@ -161,6 +161,17 @@ + vin-supply = <&vcc5v0_sys>; + }; + ++ vcc3v3_sd_s0: vcc3v3-sd-s0-regulator { ++ compatible = "regulator-fixed"; ++ enable-active-low; ++ gpio = <&gpio4 RK_PA5 GPIO_ACTIVE_LOW>; ++ regulator-boot-on; ++ regulator-max-microvolt = <3300000>; ++ regulator-min-microvolt = <3300000>; ++ regulator-name = "vcc3v3_sd_s0"; ++ vin-supply = <&vcc_3v3_s3>; ++ }; ++ + vdd_4g_3v3: vdd-4g-3v3-regulator { + compatible = "regulator-fixed"; + enable-active-high; +@@ -560,7 +571,7 @@ + no-mmc; + no-sdio; + sd-uhs-sdr104; +- vmmc-supply = <&vcc_3v3_s3>; ++ vmmc-supply = <&vcc3v3_sd_s0>; + vqmmc-supply = <&vccio_sd_s0>; + status = "okay"; + }; 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 274daf3a2b..16ea387493 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-nanopc-t6.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts -@@ -533,8 +533,7 @@ +@@ -560,8 +560,7 @@ no-sd; non-removable; max-frequency = <200000000>; @@ -46,18 +46,18 @@ Signed-off-by: David Bauer status = "okay"; }; -@@ -546,7 +545,7 @@ - cap-mmc-highspeed; - cap-sd-highspeed; +@@ -572,7 +571,7 @@ disable-wp; + no-mmc; + no-sdio; - sd-uhs-sdr104; + sd-uhs-sdr50; - vmmc-supply = <&vcc_3v3_s3>; + vmmc-supply = <&vcc3v3_sd_s0>; vqmmc-supply = <&vccio_sd_s0>; status = "okay"; --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts -@@ -364,8 +364,7 @@ +@@ -371,8 +371,7 @@ no-sd; non-removable; max-frequency = <200000000>; @@ -67,7 +67,7 @@ Signed-off-by: David Bauer status = "okay"; }; -@@ -376,9 +375,8 @@ +@@ -383,9 +382,8 @@ bus-width = <4>; cap-mmc-highspeed; cap-sd-highspeed; 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 0d603a1f18..aca511067b 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 @@ -35,7 +35,7 @@ Signed-off-by: Sebastian Reichel &gmac0 { clock_in_out = "output"; phy-handle = <&rgmii_phy>; -@@ -962,6 +977,10 @@ +@@ -963,6 +978,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 bbc5344d39..1a0a704927 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 @@ -114,7 +114,7 @@ Signed-off-by: Sebastian Reichel }; &pwm2 { -@@ -959,6 +1032,22 @@ +@@ -960,6 +1033,22 @@ status = "okay"; }; @@ -137,7 +137,7 @@ Signed-off-by: Sebastian Reichel &u2phy2 { status = "okay"; }; -@@ -1001,3 +1090,58 @@ +@@ -1002,3 +1091,58 @@ &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 c7f731a40d..82409515c3 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 -@@ -147,34 +147,42 @@ +@@ -154,34 +154,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 3ac2de06bf..714371fcc2 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 -@@ -746,6 +746,14 @@ +@@ -755,6 +755,14 @@ status = "okay"; }; @@ -28,7 +28,7 @@ Signed-off-by: Sebastian Reichel &u2phy2 { status = "okay"; }; -@@ -765,6 +773,14 @@ +@@ -774,6 +782,14 @@ status = "okay"; }; @@ -43,7 +43,7 @@ Signed-off-by: Sebastian Reichel &usb_host0_ehci { status = "okay"; }; -@@ -781,6 +797,10 @@ +@@ -790,6 +806,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 b4fdd91ad2..7dcb687b5e 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 @@ -21,8 +21,8 @@ Signed-off-by: Sebastian Reichel #include "rk3588.dtsi" / { -@@ -62,6 +63,15 @@ - #cooling-cells = <2>; +@@ -69,6 +70,15 @@ + shutdown-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>; }; + vcc12v_dcin: vcc12v-dcin-regulator { @@ -37,7 +37,7 @@ Signed-off-by: Sebastian Reichel vcc3v3_pcie2x1l0: vcc3v3-pcie2x1l0-regulator { compatible = "regulator-fixed"; enable-active-high; -@@ -120,6 +130,7 @@ +@@ -127,6 +137,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 { -@@ -225,6 +236,61 @@ +@@ -232,6 +243,61 @@ }; }; @@ -107,7 +107,7 @@ Signed-off-by: Sebastian Reichel &i2c6 { status = "okay"; -@@ -354,6 +420,10 @@ +@@ -361,6 +427,10 @@ vcc5v0_host_en: vcc5v0-host-en { rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; }; @@ -118,7 +118,7 @@ Signed-off-by: Sebastian Reichel }; }; -@@ -746,6 +816,14 @@ +@@ -755,6 +825,14 @@ status = "okay"; }; @@ -133,7 +133,7 @@ Signed-off-by: Sebastian Reichel &u2phy1 { status = "okay"; }; -@@ -781,6 +859,33 @@ +@@ -790,6 +868,33 @@ status = "okay"; }; @@ -167,7 +167,7 @@ Signed-off-by: Sebastian Reichel &usb_host0_ehci { status = "okay"; }; -@@ -789,6 +894,20 @@ +@@ -798,6 +903,20 @@ status = "okay"; }; diff --git a/target/linux/rockchip/patches-6.1/124-01-arm64-dts-rockchip-nanopc-t6-cpu-mem-regulator-info.patch b/target/linux/rockchip/patches-6.1/124-01-arm64-dts-rockchip-nanopc-t6-cpu-mem-regulator-info.patch index b522ca1fb3..33ae14ceda 100644 --- a/target/linux/rockchip/patches-6.1/124-01-arm64-dts-rockchip-nanopc-t6-cpu-mem-regulator-info.patch +++ b/target/linux/rockchip/patches-6.1/124-01-arm64-dts-rockchip-nanopc-t6-cpu-mem-regulator-info.patch @@ -1,6 +1,6 @@ --- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts -@@ -178,34 +178,42 @@ +@@ -201,34 +201,42 @@ &cpu_l0 { cpu-supply = <&vdd_cpu_lit_s0>; diff --git a/target/linux/rockchip/patches-6.1/124-02-arm64-dts-rockchip-nanopc-t6-add-lower-USB3-port.patch b/target/linux/rockchip/patches-6.1/124-02-arm64-dts-rockchip-nanopc-t6-add-lower-USB3-port.patch index 2703cf3390..9662040d4a 100644 --- a/target/linux/rockchip/patches-6.1/124-02-arm64-dts-rockchip-nanopc-t6-add-lower-USB3-port.patch +++ b/target/linux/rockchip/patches-6.1/124-02-arm64-dts-rockchip-nanopc-t6-add-lower-USB3-port.patch @@ -29,7 +29,7 @@ vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator { compatible = "regulator-fixed"; regulator-name = "vcc-1v1-nldo-s3"; -@@ -522,6 +544,10 @@ +@@ -549,6 +571,10 @@ usbc0_int: usbc0-int { rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>; }; @@ -40,7 +40,7 @@ }; }; -@@ -894,6 +920,11 @@ +@@ -920,6 +946,11 @@ status = "okay"; }; @@ -50,9 +50,9 @@ +}; + &u2phy2_host { + phy-supply = <&vdd_4g_3v3>; status = "okay"; - }; -@@ -902,6 +933,10 @@ +@@ -929,6 +960,10 @@ status = "okay"; }; @@ -63,7 +63,7 @@ &u2phy2 { status = "okay"; }; -@@ -910,6 +945,14 @@ +@@ -937,6 +972,14 @@ status = "okay"; }; @@ -78,7 +78,7 @@ &usb_host0_ehci { status = "okay"; }; -@@ -925,3 +968,7 @@ +@@ -952,3 +995,7 @@ &usb_host1_ohci { status = "okay"; }; diff --git a/target/linux/rockchip/patches-6.1/124-03-arm64-dts-rockchip-nanopc-t6-add-USB-C-support.patch b/target/linux/rockchip/patches-6.1/124-03-arm64-dts-rockchip-nanopc-t6-add-USB-C-support.patch index fc4d841b56..dd1f64d889 100644 --- a/target/linux/rockchip/patches-6.1/124-03-arm64-dts-rockchip-nanopc-t6-add-USB-C-support.patch +++ b/target/linux/rockchip/patches-6.1/124-03-arm64-dts-rockchip-nanopc-t6-add-USB-C-support.patch @@ -1,6 +1,6 @@ --- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts -@@ -396,6 +396,48 @@ +@@ -419,6 +419,48 @@ source-pdos = ; sink-pdos = ; op-sink-microwatt = <1000000>; @@ -49,7 +49,7 @@ }; }; -@@ -920,6 +962,10 @@ +@@ -946,6 +988,10 @@ status = "okay"; }; @@ -60,7 +60,7 @@ &u2phy1_otg { phy-supply = <&vcc5v0_host_30>; status = "okay"; -@@ -933,6 +979,10 @@ +@@ -960,6 +1006,10 @@ status = "okay"; }; @@ -71,7 +71,7 @@ &u2phy1 { status = "okay"; }; -@@ -945,6 +995,33 @@ +@@ -972,6 +1022,33 @@ status = "okay"; }; @@ -105,7 +105,7 @@ &usbdp_phy1 { status = "okay"; }; -@@ -961,6 +1038,21 @@ +@@ -988,6 +1065,21 @@ status = "okay"; }; diff --git a/target/linux/rockchip/patches-6.1/603-net-ethernet-stmmac-add-devname-configuration-from-OF.patch b/target/linux/rockchip/patches-6.1/603-net-ethernet-stmmac-add-devname-configuration-from-OF.patch index 42dfdd71c4..1e29a0d6c1 100644 --- a/target/linux/rockchip/patches-6.1/603-net-ethernet-stmmac-add-devname-configuration-from-OF.patch +++ b/target/linux/rockchip/patches-6.1/603-net-ethernet-stmmac-add-devname-configuration-from-OF.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -@@ -7091,6 +7091,7 @@ int stmmac_dvr_probe(struct device *devi +@@ -7114,6 +7114,7 @@ int stmmac_dvr_probe(struct device *devi { struct net_device *ndev = NULL; struct stmmac_priv *priv; @@ -8,7 +8,7 @@ u32 rxq; int i, ret = 0; -@@ -7099,6 +7100,9 @@ int stmmac_dvr_probe(struct device *devi +@@ -7122,6 +7123,9 @@ int stmmac_dvr_probe(struct device *devi if (!ndev) return -ENOMEM; diff --git a/target/linux/rockchip/patches-6.1/610-arm64-rockchip-add-OF-node-for-eth.patch b/target/linux/rockchip/patches-6.1/610-arm64-rockchip-add-OF-node-for-eth.patch index 975ee1f7ac..76f30ac2e2 100644 --- a/target/linux/rockchip/patches-6.1/610-arm64-rockchip-add-OF-node-for-eth.patch +++ b/target/linux/rockchip/patches-6.1/610-arm64-rockchip-add-OF-node-for-eth.patch @@ -176,7 +176,7 @@ Signed-off-by: David Bauer --- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts -@@ -505,6 +505,17 @@ +@@ -528,6 +528,17 @@ pinctrl-names = "default"; pinctrl-0 = <&pcie2_0_rst>; status = "okay"; @@ -194,7 +194,7 @@ Signed-off-by: David Bauer }; &pcie2x1l1 { -@@ -521,6 +532,17 @@ +@@ -544,6 +555,17 @@ pinctrl-names = "default"; pinctrl-0 = <&pcie2_2_rst>; status = "okay"; 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 c65128dfa8..9be3c0842e 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-nanopc-t6.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts -@@ -620,6 +620,10 @@ +@@ -647,6 +647,10 @@ status = "okay"; }; @@ -65,7 +65,7 @@ status = "okay"; --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts -@@ -431,6 +431,10 @@ +@@ -438,6 +438,10 @@ status = "okay"; };