mirror of
https://github.com/LibreELEC/LibreELEC.tv
synced 2025-09-24 19:46:01 +07:00
91 lines
2.4 KiB
Diff
91 lines
2.4 KiB
Diff
From 3504dae677104a8cf12d625ad628726c5b061c7b Mon Sep 17 00:00:00 2001
|
|
From: Jonas Karlman <jonas@kwiboo.se>
|
|
Date: Mon, 21 Jul 2025 22:07:19 +0000
|
|
Subject: [PATCH 11/84] rockchip: rk3588-generic: Move usb nodes to board dts
|
|
|
|
After the commit 7a53abb18325 ("rockchip: rk3588: Remove USB3 DRD nodes
|
|
in u-boot.dtsi") was merged for v2024.10 there is no reason to keep the
|
|
usb nodes for the Generic RK3588 board in the board u-boot.dtsi.
|
|
|
|
Move usb related nodes from board u-boot.dtsi to main board device tree.
|
|
|
|
While at it, also drop use of the usb3-phy as we only want to enable the
|
|
usb2-phy to be compatible with as many boards as possible.
|
|
|
|
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
|
|
---
|
|
arch/arm/dts/rk3588-generic-u-boot.dtsi | 18 ------------------
|
|
arch/arm/dts/rk3588-generic.dts | 16 ++++++++++++++++
|
|
configs/generic-rk3588_defconfig | 1 -
|
|
3 files changed, 16 insertions(+), 19 deletions(-)
|
|
|
|
diff --git a/arch/arm/dts/rk3588-generic-u-boot.dtsi b/arch/arm/dts/rk3588-generic-u-boot.dtsi
|
|
index f67301d87a6..853ed58cfe5 100644
|
|
--- a/arch/arm/dts/rk3588-generic-u-boot.dtsi
|
|
+++ b/arch/arm/dts/rk3588-generic-u-boot.dtsi
|
|
@@ -1,21 +1,3 @@
|
|
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
|
|
|
#include "rk3588s-u-boot.dtsi"
|
|
-
|
|
-&u2phy0 {
|
|
- status = "okay";
|
|
-};
|
|
-
|
|
-&u2phy0_otg {
|
|
- status = "okay";
|
|
-};
|
|
-
|
|
-&usbdp_phy0 {
|
|
- status = "okay";
|
|
-};
|
|
-
|
|
-&usb_host0_xhci {
|
|
- dr_mode = "peripheral";
|
|
- maximum-speed = "high-speed";
|
|
- status = "okay";
|
|
-};
|
|
diff --git a/arch/arm/dts/rk3588-generic.dts b/arch/arm/dts/rk3588-generic.dts
|
|
index 95d757676f1..6740f9866f1 100644
|
|
--- a/arch/arm/dts/rk3588-generic.dts
|
|
+++ b/arch/arm/dts/rk3588-generic.dts
|
|
@@ -39,7 +39,23 @@
|
|
status = "okay";
|
|
};
|
|
|
|
+&u2phy0 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&u2phy0_otg {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&uart2 {
|
|
pinctrl-0 = <&uart2m0_xfer>;
|
|
status = "okay";
|
|
};
|
|
+
|
|
+&usb_host0_xhci {
|
|
+ dr_mode = "peripheral";
|
|
+ maximum-speed = "high-speed";
|
|
+ phys = <&u2phy0_otg>;
|
|
+ phy-names = "usb2-phy";
|
|
+ status = "okay";
|
|
+};
|
|
diff --git a/configs/generic-rk3588_defconfig b/configs/generic-rk3588_defconfig
|
|
index ed2f936b324..dfa8efabe6b 100644
|
|
--- a/configs/generic-rk3588_defconfig
|
|
+++ b/configs/generic-rk3588_defconfig
|
|
@@ -53,7 +53,6 @@ CONFIG_MMC_SDHCI=y
|
|
CONFIG_MMC_SDHCI_SDMA=y
|
|
CONFIG_MMC_SDHCI_ROCKCHIP=y
|
|
CONFIG_PHY_ROCKCHIP_INNO_USB2=y
|
|
-CONFIG_PHY_ROCKCHIP_USBDP=y
|
|
CONFIG_SPL_PINCTRL=y
|
|
CONFIG_SPL_RAM=y
|
|
CONFIG_BAUDRATE=1500000
|
|
--
|
|
2.34.1
|
|
|