Nanako/xx_vv_immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rockchip: add missing backport for nanopc t6

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2024-09-06 15:35:50 +08:00
parent e600d67da2
commit 310d611294
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
10 changed files with 105 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
target/linux/rockchip/patches-6.6/053-09-v6.12-arm64-dts-rockchip-move-NanoPC-T6-parts-to-DTS.patch Normal file
View File

@ -0,0 +1,85 @@
From aea8d84070fe0846961deb23228d9dd3f8caefb3 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Date: Thu, 29 Aug 2024 14:26:54 +0200
Subject: [PATCH] arm64: dts: rockchip: move NanoPC-T6 parts to DTS
MiniPCIe slot is present only in first version of NanoPC-T6 (2301).
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Link: https://lore.kernel.org/r/20240829-friendlyelec-nanopc-t6-lts-v6-3-edff247e8c02@linaro.org
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
.../boot/dts/rockchip/rk3588-nanopc-t6.dts | 23 +++++++++++++++++++
.../boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 17 --------------
2 files changed, 23 insertions(+), 17 deletions(-)
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
@@ -14,4 +14,27 @@
model = "FriendlyElec NanoPC-T6";
compatible = "friendlyarm,nanopc-t6", "rockchip,rk3588";
+ 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>;
+ };
+};
+
+&pinctrl {
+ usb {
+ pin_4g_lte_pwren: 4g-lte-pwren {
+ rockchip,pins = <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+ };
+};
+
+&u2phy2_host {
+ phy-supply = <&vdd_4g_3v3>;
};
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
@@ -170,18 +170,6 @@
regulator-name = "vcc3v3_sd_s0";
vin-supply = <&vcc_3v3_s3>;
};
-
- 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 {
@@ -527,10 +515,6 @@
};
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>;
};
@@ -912,7 +896,6 @@
};
&u2phy2_host {
- phy-supply = <&vdd_4g_3v3>;
status = "okay";
};

2
target/linux/rockchip/patches-6.6/053-09-v6.12-arm64-dts-rockchip-add-SPI-flash-on-NanoPC-T6.patch → target/linux/rockchip/patches-6.6/053-10-v6.12-arm64-dts-rockchip-add-SPI-flash-on-NanoPC-T6.patch
View File

@ -16,7 +16,7 @@ Signed-off-by: Heiko Stuebner <heiko@sntech.de>
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
@@ -576,6 +576,21 @@
@@ -560,6 +560,21 @@
status = "okay";
};

4
target/linux/rockchip/patches-6.6/053-10-v6.12-arm64-dts-rockchip-add-IR-receiver-to-NanoPC-T6.patch → target/linux/rockchip/patches-6.6/053-11-v6.12-arm64-dts-rockchip-add-IR-receiver-to-NanoPC-T6.patch
View File

@ -29,7 +29,7 @@ Signed-off-by: Heiko Stuebner <heiko@sntech.de>
leds {
compatible = "gpio-leds";
@@ -240,7 +247,7 @@
@@ -228,7 +235,7 @@
"HEADER_10", "HEADER_08", "HEADER_32", "",
/* GPIO0 D0-D7 */
"", "", "", "",
@ -38,7 +38,7 @@ Signed-off-by: Heiko Stuebner <heiko@sntech.de>
};
&gpio1 {
@@ -504,6 +511,12 @@
@@ -492,6 +499,12 @@
};
};

2
target/linux/rockchip/patches-6.6/053-11-v6.12-arm64-dts-rockchip-enable-GPU-on-NanoPC-T6.patch → target/linux/rockchip/patches-6.6/053-12-v6.12-arm64-dts-rockchip-enable-GPU-on-NanoPC-T6.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: Heiko Stuebner <heiko@sntech.de>
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
@@ -310,6 +310,11 @@
@@ -298,6 +298,11 @@
"", "", "", "";
};

10
target/linux/rockchip/patches-6.6/053-12-v6.12-arm64-dts-rockchip-enable-USB-C-on-NanoPC-T6.patch → target/linux/rockchip/patches-6.6/053-13-v6.12-arm64-dts-rockchip-enable-USB-C-on-NanoPC-T6.patch
View File

@ -25,7 +25,7 @@ Signed-off-by: Heiko Stuebner <heiko@sntech.de>
regulator-name = "vbus5v0_typec";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
@@ -393,11 +395,34 @@
@@ -381,11 +383,34 @@
compatible = "usb-c-connector";
data-role = "dual";
label = "USB-C";
@ -64,7 +64,7 @@ Signed-off-by: Heiko Stuebner <heiko@sntech.de>
};
};
@@ -944,6 +969,14 @@
@@ -928,6 +953,14 @@
status = "okay";
};
@ -77,9 +77,9 @@ Signed-off-by: Heiko Stuebner <heiko@sntech.de>
+};
+
&u2phy2_host {
phy-supply = <&vdd_4g_3v3>;
status = "okay";
@@ -961,6 +994,29 @@
};
@@ -944,6 +977,29 @@
status = "okay";
};
@ -109,7 +109,7 @@ Signed-off-by: Heiko Stuebner <heiko@sntech.de>
&usb_host0_ehci {
status = "okay";
};
@@ -969,6 +1025,18 @@
@@ -952,6 +1008,18 @@
status = "okay";
};

0
target/linux/rockchip/patches-6.6/053-13-v6.12-arm64-dts-rockchip-add-Mask-Rom-key-on-NanoPC-T6.patch → target/linux/rockchip/patches-6.6/053-14-v6.12-arm64-dts-rockchip-add-Mask-Rom-key-on-NanoPC-T6.patch
View File

2
target/linux/rockchip/patches-6.6/053-14-v6.12-arm64-dts-rockchip-use-correct-fcs-suspend-voltage-selecto.patch → target/linux/rockchip/patches-6.6/053-15-v6.12-arm64-dts-rockchip-use-correct-fcs-suspend-voltage-selecto.patch
View File

@ -17,7 +17,7 @@ Signed-off-by: Heiko Stuebner <heiko@sntech.de>
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
@@ -378,7 +378,7 @@
@@ -366,7 +366,7 @@
vdd_npu_s0: regulator@42 {
compatible = "rockchip,rk8602";
reg = <0x42>;

4
target/linux/rockchip/patches-6.6/103-arm64-dts-rockchip-lower-mmc-speed.patch
View File

@ -36,7 +36,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
};
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
@@ -618,8 +618,7 @@
@@ -602,8 +602,7 @@
no-sd;
non-removable;
max-frequency = <200000000>;
@ -46,7 +46,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
status = "okay";
};
@@ -631,7 +630,7 @@
@@ -615,7 +614,7 @@
disable-wp;
no-mmc;
no-sdio;

12
target/linux/rockchip/patches-6.6/124-02-arm64-dts-rockchip-nanopc-t6-add-lower-USB3-port.patch
View File

@ -29,7 +29,7 @@
/* vcc4v0_sys powers the RK806, RK860's */
vcc4v0_sys: vcc4v0-sys-regulator {
compatible = "regulator-fixed";
@@ -599,6 +621,10 @@
@@ -583,6 +605,10 @@
usbc0_int: usbc0-int {
rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>;
};
@ -40,7 +40,7 @@
};
};
@@ -994,6 +1020,11 @@
@@ -978,6 +1004,11 @@
status = "okay";
};
@ -50,9 +50,9 @@
+};
+
&u2phy2_host {
phy-supply = <&vdd_4g_3v3>;
status = "okay";
@@ -1003,6 +1034,10 @@
};
@@ -986,6 +1017,10 @@
status = "okay";
};
@ -63,7 +63,7 @@
&u2phy2 {
status = "okay";
};
@@ -1034,6 +1069,10 @@
@@ -1017,6 +1052,10 @@
};
};
@ -74,7 +74,7 @@
&usb_host0_ehci {
status = "okay";
};
@@ -1061,3 +1100,7 @@
@@ -1044,3 +1083,7 @@
&usb_host1_ohci {
status = "okay";
};

4
target/linux/rockchip/patches-6.6/610-arm64-rockchip-add-OF-node-for-eth.patch
View File

@ -311,7 +311,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
@@ -530,6 +530,20 @@
@@ -518,6 +518,20 @@
pinctrl-names = "default";
pinctrl-0 = <&pcie2_0_rst>;
status = "okay";
@ -332,7 +332,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
};
&pcie2x1l1 {
@@ -546,6 +560,20 @@
@@ -534,6 +548,20 @@
pinctrl-names = "default";
pinctrl-0 = <&pcie2_2_rst>;
status = "okay";