mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-11-22 04:56:15 +00:00
e05b24175d
Reorder nanopc t6 patches to 055 to avoid conflict with nanopi r6c patches.
Fixes: 55c46cbabd76 ("rockchip: add FriendlyElec NanoPi R6C")
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
Link: https://github.com/openwrt/openwrt/pull/16461
Signed-off-by: Nick Hainke <vincent@systemli.org>
86 lines
2.4 KiB
Diff
86 lines
2.4 KiB
Diff
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";
|
|
};
|
|
|