enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NanoPi R4S USB ports by moving NanoPC device tree specific changes (#2877)

Browse Source
This commit is contained in:
Piotr Szczepanik 2021-06-14 21:27:35 +02:00 committed by GitHub
parent d166d16377
commit 8c6662280c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
patch/kernel/archive/rockchip64-5.10/board-nanopc-t4-add-typec-dp.patch
View File

@ -5,15 +5,22 @@ Subject: [PATCH] Patching something
Signed-off-by: tonymac32 <tonymckahan@gmail.com>
---
.../boot/dts/rockchip/rk3399-nanopc-t4.dts | 83 +++++++++++++++++++
.../boot/dts/rockchip/rk3399-nanopi4.dtsi | 27 +++---
2 files changed, 98 insertions(+), 12 deletions(-)
.../boot/dts/rockchip/rk3399-nanopc-t4.dts | 100 +++++++++++++++++++
1 file changed, 98 insertions(+), 12 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts b/arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts
index e0d75617b..bbe200ab6 100644
index e0d75617b..68f1a06fa 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts
@@ -66,6 +66,12 @@ fan: pwm-fan {
@@ -9,6 +9,7 @@
*/
/dts-v1/;
+#include <dt-bindings/usb/pd.h>
#include "rk3399-nanopi4.dtsi"
/ {
@@ -66,6 +67,12 @@ fan: pwm-fan {
};
};
@ -26,7 +33,7 @@ index e0d75617b..bbe200ab6 100644
&cpu_thermal {
trips {
cpu_warm: cpu_warm {
@@ -94,6 +100,50 @@ map3 {
@@ -94,6 +101,50 @@ map3 {
};
};
@ -77,7 +84,7 @@ index e0d75617b..bbe200ab6 100644
&pcie0 {
num-lanes = <4>;
vpcie3v3-supply = <&vcc3v3_sys>;
@@ -113,14 +163,47 @@ &sdhci {
@@ -113,12 +164,57 @@ &sdhci {
mmc-hs400-enhanced-strobe;
};
@ -101,83 +108,40 @@ index e0d75617b..bbe200ab6 100644
+ };
+ };
+};
+
+&u2phy0 {
+ extcon = <&fusb0>;
+};
+
&u2phy0_host {
phy-supply = <&vcc5v0_host0>;
};
+ status = "okay";
+};
+
+&u2phy0_otg {
+ status = "okay";
+
+ port {
+ u2phy0_typec_hs: endpoint {
+ remote-endpoint = <&usb_con_hs>;
+ };
+ };
+};
+
};
&u2phy1_host {
phy-supply = <&vcc5v0_host0>;
};
+&usbdrd_dwc3_0 {
+ extcon = <&fusb0>;
+ status = "okay";
+};
+
&vcc5v0_sys {
vin-supply = <&vcc12v0_sys>;
};
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
index 86e802fd8..9c2e8c8ae 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
@@ -13,6 +13,7 @@
/dts-v1/;
#include <dt-bindings/input/linux-event-codes.h>
+#include <dt-bindings/usb/pd.h>
#include "rk3399.dtsi"
#include "rk3399-opp.dtsi"
@@ -706,26 +707,28 @@ &tsadc {
&u2phy0 {
status = "okay";
-};
+&u2phy1_otg {
+ status = "okay";
+};
+
+&usbdrd_dwc3_0 {
+ extcon = <&fusb0>;
-&u2phy0_host {
- status = "okay";
-};
+ u2phy0_otg: otg-port {
+ status = "okay";
+ };
-&u2phy0_otg {
- status = "okay";
+ u2phy0_host: host-port {
+ status = "okay";
+ };
};
&u2phy1 {
status = "okay";
-};
+
+ u2phy1_otg: otg-port {
+ status = "okay";
+ };
-&u2phy1_host {
- status = "okay";
-};
+ u2phy1_host: host-port {
+ status = "okay";
+ };
-&u2phy1_otg {
- status = "okay";
};
&uart0 {
&vcc5v0_sys {
--
Created with Armbian build tools https://github.com/armbian/build