From 918f498b85fdd827ced54ceefdfb8728cb5900c4 Mon Sep 17 00:00:00 2001
From: Jianlong Wang <jianlong.wang@rock-chips.com>
Date: Tue, 24 Dec 2024 19:30:39 +0800
Subject: [PATCH] arm64: dts: rockchip: rk3328: update usbbrd3 core node

[    3.899868] rockchip-inno-dwc3 usbdrd: failed to find dwc3 core node

Fixes: 655d0987f969 ("arm64: dts: rockchip: rk3328: update to kernel6.1")
Change-Id: I1866a9bd897b3da93afb3b5f8e2279992555353d
Signed-off-by: Jianlong Wang <jianlong.wang@rock-chips.com>
---
 .../dts/rockchip/rk3328-box-liantong.dtsi     |  4 --
 .../boot/dts/rockchip/rk3328-evb-android.dtsi |  4 --
 arch/arm64/boot/dts/rockchip/rk3328-evb.dts   |  4 --
 .../boot/dts/rockchip/rk3328-nanopi-r2s.dts   |  5 ---
 .../dts/rockchip/rk3328-rock64-android.dtsi   |  4 --
 arch/arm64/boot/dts/rockchip/rk3328.dtsi      | 40 ++++++++-----------
 6 files changed, 16 insertions(+), 45 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dtsi
index e64cf04972d8..60640595bce8 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dtsi
@@ -637,10 +637,6 @@
 	status = "okay";
 };
 
-&usbdrd_dwc3 {
-	status = "okay";
-};
-
 &vdpu {
 	status = "okay";
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dtsi
index 708d580015cc..3e98f013bb61 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dtsi
@@ -679,10 +679,6 @@
 	status = "okay";
 };
 
-&usbdrd_dwc3 {
-	status = "okay";
-};
-
 &vdpu {
 	status = "okay";
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb.dts b/arch/arm64/boot/dts/rockchip/rk3328-evb.dts
index e2729fc3d483..4f525e72ae26 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-evb.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-evb.dts
@@ -633,10 +633,6 @@
 	status = "okay";
 };
 
-&usbdrd_dwc3 {
-	status = "okay";
-};
-
 &vdpu {
 	status = "okay";
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
index 64fa7428bba6..de6638e5d3dc 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
@@ -389,11 +389,6 @@
 
 &usbdrd3 {
 	status = "okay";
-};
-
-&usbdrd_dwc3 {
-	dr_mode = "host";
-	status = "okay";
 	#address-cells = <1>;
 	#size-cells = <0>;
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dtsi
index 3dad4f4fafcb..41a54e111a56 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dtsi
@@ -575,10 +575,6 @@
 	status = "okay";
 };
 
-&usbdrd_dwc3 {
-	status = "okay";
-};
-
 &vdpu {
 	status = "okay";
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
index 7133895db8a7..b9440b310520 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -1553,35 +1553,27 @@
 		status = "disabled";
 	};
 
-	usbdrd3: usbdrd {
-		compatible = "rockchip,rk3328-dwc3";
+	usbdrd3: usb@ff600000 {
+		compatible = "rockchip,rk3328-dwc3", "snps,dwc3";
+		reg = <0x0 0xff600000 0x0 0x100000>;
+		interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&cru SCLK_USB3OTG_REF>, <&cru SCLK_USB3OTG_SUSPEND>,
 			 <&cru ACLK_USB3OTG>;
 		clock-names = "ref_clk", "suspend_clk",
 			      "bus_clk";
-		#address-cells = <2>;
-		#size-cells = <2>;
-		ranges;
+		dr_mode = "host";
+		phys = <&u3phy_utmi>, <&u3phy_pipe>;
+		phy-names = "usb2-phy", "usb3-phy";
+		phy_type = "utmi_wide";
+		snps,dis-del-phy-power-chg-quirk;
+		snps,dis_enblslpm_quirk;
+		snps,dis-tx-ipgap-linecheck-quirk;
+		snps,dis-u2-freeclk-exists-quirk;
+		snps,dis_u2_susphy_quirk;
+		snps,dis_u3_susphy_quirk;
+		snps,parkmode-disable-hs-quirk;
+		snps,parkmode-disable-ss-quirk;
 		status = "disabled";
-
-		usbdrd_dwc3: usb@ff600000 {
-			compatible = "snps,dwc3";
-			reg = <0x0 0xff600000 0x0 0x100000>;
-			interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
-			dr_mode = "host";
-			phys = <&u3phy_utmi>, <&u3phy_pipe>;
-			phy-names = "usb2-phy", "usb3-phy";
-			phy_type = "utmi_wide";
-			snps,dis-del-phy-power-chg-quirk;
-			snps,dis_enblslpm_quirk;
-			snps,dis-tx-ipgap-linecheck-quirk;
-			snps,dis-u2-freeclk-exists-quirk;
-			snps,dis_u2_susphy_quirk;
-			snps,dis_u3_susphy_quirk;
-			snps,parkmode-disable-hs-quirk;
-			snps,parkmode-disable-ss-quirk;
-			status = "disabled";
-		};
 	};
 
 	qos_rkvdec_r: qos@ff750000 {