Skip to contentSkip to conversation

arm64: dts: rockchip: Sync DT from linux-next

PATCH Superseded Jagan Teki 3 participants 7 messages Jul 17, 2023 – Jul 19, 2023

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Jagan Teki

author
#0 lore raw

PATCH 1/2 arm64: dts: rockchip: Sync DT from linux-next

Sync the linux-next from below commit,
commit <1642bf66e270> ("arm64: dts: rockchip: add USB2 to rk3588s-rock5a")

Also rops the duplicate usb nodes from rk3588s-u-boot.dtsi

---
 arch/arm/dts/rk3588-edgeble-neu6a.dtsi   |   1 -
 arch/arm/dts/rk3588-edgeble-neu6b-io.dts |  66 +++
 arch/arm/dts/rk3588-edgeble-neu6b.dtsi   | 359 ++++++++++-
 arch/arm/dts/rk3588-evb1-v10.dts         | 720 ++++++++++++++++++++++-
 arch/arm/dts/rk3588-rock-5b-u-boot.dtsi  |  13 -
 arch/arm/dts/rk3588-rock-5b.dts          | 578 +++++++++++++++++-
 arch/arm/dts/rk3588.dtsi                 | 112 ++++
 arch/arm/dts/rk3588s-u-boot.dtsi         | 119 ----
 arch/arm/dts/rk3588s.dtsi                | 499 +++++++++++++++-
 include/dt-bindings/ata/ahci.h           |  20 +
 10 files changed, 2346 insertions(+), 141 deletions(-)
 create mode 100644 include/dt-bindings/ata/ahci.h
arch/arm/dts/rk3588-edgeble-neu6a.dtsi +0 -1
index 38e1a1e25f..727580aaa1 100644
@@ -25,7 +25,6 @@
 	no-sdio;
 	no-sd;
 	non-removable;
-	max-frequency = <200000000>;
 	mmc-hs400-1_8v;
 	mmc-hs400-enhanced-strobe;
 	status = "okay";
arch/arm/dts/rk3588-edgeble-neu6b-io.dts +66 -0

73 lines not on this page · raw message

arch/arm/dts/rk3588-edgeble-neu6b.dtsi +358 -1

372 lines not on this page · raw message

arch/arm/dts/rk3588-evb1-v10.dts +719 -1

750 lines not on this page · raw message

arch/arm/dts/rk3588-rock-5b-u-boot.dtsi +0 -13
index 1cd8a57a6f..03d1560564 100644
@@ -99,11 +99,6 @@
 	bootph-all;
 };
 
-&sdmmc {
-	bus-width = <4>;
-	status = "okay";
-};
-
 &sdmmc_bus4 {
 	bootph-all;
 };
@@ -120,14 +115,6 @@
 	bootph-all;
 };
 
-&sdhci {
-	cap-mmc-highspeed;
-	mmc-ddr-1_8v;
-	mmc-hs200-1_8v;
-	pinctrl-names = "default";
-	pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_data_strobe &emmc_rstnout>;
-};
-
 &sfc {
 	bootph-pre-ram;
 	u-boot,spl-sfc-no-dma;
arch/arm/dts/rk3588-rock-5b.dts +577 -1

608 lines not on this page · raw message

arch/arm/dts/rk3588.dtsi +112 -0

122 lines not on this page · raw message

arch/arm/dts/rk3588s-u-boot.dtsi +0 -119

142 lines not on this page · raw message

arch/arm/dts/rk3588s.dtsi +494 -5

662 lines not on this page · raw message

include/dt-bindings/ata/ahci.h new file +20 -0
new file mode 100644
index 0000000000..77997b3561
@@ -0,0 +1,20 @@
+/* SPDX-License-Identifier: GPL-2.0-only or BSD-2-Clause */
+/*
+ * This header provides constants for most AHCI bindings.
+ */
+
+#ifndef _DT_BINDINGS_ATA_AHCI_H
+#define _DT_BINDINGS_ATA_AHCI_H
+
+/* Host Bus Adapter generic platform capabilities */
+#define HBA_SSS		(1 << 27)
+#define HBA_SMPS	(1 << 28)
+
+/* Host Bus Adapter port-specific platform capabilities */
+#define HBA_PORT_HPCP	(1 << 18)
+#define HBA_PORT_MPSP	(1 << 19)
+#define HBA_PORT_CPD	(1 << 20)
+#define HBA_PORT_ESP	(1 << 21)
+#define HBA_PORT_FBSCP	(1 << 22)
+
+#endif
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 2/2 rockchip: edgeble-neu6: Append eMMC into spl-boot-order

Now, edgeble-neu6 NCM IO boards support eMMC and SDMMC.

So, Update the spl-boot-order to include both.

---
 arch/arm/dts/rk3588-edgeble-neu6a-io-u-boot.dtsi | 10 ++--------
 arch/arm/dts/rk3588-edgeble-neu6b-io-u-boot.dtsi | 10 ++--------
 2 files changed, 4 insertions(+), 16 deletions(-)
arch/arm/dts/rk3588-edgeble-neu6a-io-u-boot.dtsi +2 -8
index 373f369c65..7ddfd98770 100644
@@ -7,16 +7,10 @@
 
 / {
 	aliases {
-		mmc0 = &sdmmc;
+		mmc1 = &sdmmc;
 	};
 
 	chosen {
-		stdout-path = &uart2;
-		u-boot,spl-boot-order = &sdmmc;
+		u-boot,spl-boot-order = "same-as-spl", &sdmmc, &sdhci;
 	};
 };
-
-&sdmmc {
-	bus-width = <4>;
-	status = "okay";
-};
arch/arm/dts/rk3588-edgeble-neu6b-io-u-boot.dtsi +2 -8
index cd7626b24b..2bc1a98ff8 100644
@@ -7,16 +7,10 @@
 
 / {
 	aliases {
-		mmc0 = &sdmmc;
+		mmc1 = &sdmmc;
 	};
 
 	chosen {
-		stdout-path = &uart2;
-		u-boot,spl-boot-order = &sdmmc;
+		u-boot,spl-boot-order = "same-as-spl", &sdmmc, &sdhci;
 	};
 };
-
-&sdmmc {
-	bus-width = <4>;
-	status = "okay";
-};
Signature · 1 line
2.25.1
#2 lore raw
In reply to Jagan Teki

Hi Jagan,

Quoted 3 lines · Jagan Teki

Sync the linux-next from below commit,
commit <1642bf66e270> ("arm64: dts: rockchip: add USB2 to rk3588s-rock5a")

Eugen sent a sync patch earlier, guess this contains a newer sync with
more features/nodes :-)
See https://patchwork.ozlabs.org/project/uboot/patch/[email protected]/

Quoted 2 lines

Also rops the duplicate usb nodes from rk3588s-u-boot.dtsi

nit: drops

Quoted 16 lines
---
 arch/arm/dts/rk3588-edgeble-neu6a.dtsi   |   1 -
 arch/arm/dts/rk3588-edgeble-neu6b-io.dts |  66 +++
 arch/arm/dts/rk3588-edgeble-neu6b.dtsi   | 359 ++++++++++-
 arch/arm/dts/rk3588-evb1-v10.dts         | 720 ++++++++++++++++++++++-
 arch/arm/dts/rk3588-rock-5b-u-boot.dtsi  |  13 -
 arch/arm/dts/rk3588-rock-5b.dts          | 578 +++++++++++++++++-
 arch/arm/dts/rk3588.dtsi                 | 112 ++++
 arch/arm/dts/rk3588s-u-boot.dtsi         | 119 ----
 arch/arm/dts/rk3588s.dtsi                | 499 +++++++++++++++-
 include/dt-bindings/ata/ahci.h           |  20 +
 10 files changed, 2346 insertions(+), 141 deletions(-)
 create mode 100644 include/dt-bindings/ata/ahci.h

[...]

Quoted 17 lines
arch/arm/dts/rk3588-rock-5b-u-boot.dtsi +0 -5
index 1cd8a57a6f..03d1560564 100644
@@ -99,11 +99,6 @@
 	bootph-all;
 };
 
-&sdmmc {
-	bus-width = <4>;
-	status = "okay";
-};
-
 &sdmmc_bus4 {
 	bootph-all;
 };

arch/arm/dts/rk3588-rock-5b-u-boot.dtsi line 129

Quoted 10 lines
arch/arm/dts/rk3588-rock-5b-u-boot.dtsi +0 -7
@@ -120,14 +115,6 @@
 	bootph-all;
 };
 
-&sdhci {
-	cap-mmc-highspeed;
-	mmc-ddr-1_8v;
-	mmc-hs200-1_8v;
-	pinctrl-names = "default";
-	pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_data_strobe &emmc_rstnout>;
-};

This should not be removed, the missing modes and pinctrl has still not been sent upstream, please leave this node.

Regards,
Jonas

Quoted 4 lines
arch/arm/dts/rk3588-rock-5b-u-boot.dtsi +0 -1
-
 &sfc {
 	bootph-pre-ram;
 	u-boot,spl-sfc-no-dma;

[...]

author
#3 lore raw
Quoted 55 lines · Jonas Karlman

Hi Jagan,

Quoted 3 lines · Jagan Teki

Sync the linux-next from below commit,
commit <1642bf66e270> ("arm64: dts: rockchip: add USB2 to rk3588s-rock5a")

Eugen sent a sync patch earlier, guess this contains a newer sync with
more features/nodes :-)
See https://patchwork.ozlabs.org/project/uboot/patch/[email protected]/

Quoted 2 lines

Also rops the duplicate usb nodes from rk3588s-u-boot.dtsi

nit: drops

Quoted 16 lines
---
 arch/arm/dts/rk3588-edgeble-neu6a.dtsi   |   1 -
 arch/arm/dts/rk3588-edgeble-neu6b-io.dts |  66 +++
 arch/arm/dts/rk3588-edgeble-neu6b.dtsi   | 359 ++++++++++-
 arch/arm/dts/rk3588-evb1-v10.dts         | 720 ++++++++++++++++++++++-
 arch/arm/dts/rk3588-rock-5b-u-boot.dtsi  |  13 -
 arch/arm/dts/rk3588-rock-5b.dts          | 578 +++++++++++++++++-
 arch/arm/dts/rk3588.dtsi                 | 112 ++++
 arch/arm/dts/rk3588s-u-boot.dtsi         | 119 ----
 arch/arm/dts/rk3588s.dtsi                | 499 +++++++++++++++-
 include/dt-bindings/ata/ahci.h           |  20 +
 10 files changed, 2346 insertions(+), 141 deletions(-)
 create mode 100644 include/dt-bindings/ata/ahci.h

[...]

Quoted 20 lines
arch/arm/dts/rk3588-rock-5b-u-boot.dtsi +0 -5
index 1cd8a57a6f..03d1560564 100644
@@ -99,11 +99,6 @@
      bootph-all;
 };
 
-&sdmmc {
-     bus-width = <4>;
-     status = "okay";
-};
-
 &sdmmc_bus4 {
      bootph-all;
 };
@@ -120,14 +115,6 @@
      bootph-all;
 };
 
Quoted 10 lines

arch/arm/dts/rk3588-rock-5b-u-boot.dtsi line 129

Quoted 7 lines
arch/arm/dts/rk3588-rock-5b-u-boot.dtsi +0 -7
-&sdhci {
-     cap-mmc-highspeed;
-     mmc-ddr-1_8v;
-     mmc-hs200-1_8v;
-     pinctrl-names = "default";
-     pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_data_strobe &emmc_rstnout>;
-};

This should not be removed, the missing modes and pinctrl has still not been sent upstream, please leave this node.

pinctrl is already in rk3588s.dtsi and modes are not.

Thanks,
Jagan.

#4 lore raw
In reply to Jagan Teki
Quoted 21 lines · Jagan Teki

Sync the linux-next from below commit,
commit <1642bf66e270> ("arm64: dts: rockchip: add USB2 to rk3588s-rock5a")

Also rops the duplicate usb nodes from rk3588s-u-boot.dtsi

---
  arch/arm/dts/rk3588-edgeble-neu6a.dtsi   |   1 -
  arch/arm/dts/rk3588-edgeble-neu6b-io.dts |  66 +++
  arch/arm/dts/rk3588-edgeble-neu6b.dtsi   | 359 ++++++++++-
  arch/arm/dts/rk3588-evb1-v10.dts         | 720 ++++++++++++++++++++++-
  arch/arm/dts/rk3588-rock-5b-u-boot.dtsi  |  13 -
  arch/arm/dts/rk3588-rock-5b.dts          | 578 +++++++++++++++++-
  arch/arm/dts/rk3588.dtsi                 | 112 ++++
  arch/arm/dts/rk3588s-u-boot.dtsi         | 119 ----
  arch/arm/dts/rk3588s.dtsi                | 499 +++++++++++++++-
  include/dt-bindings/ata/ahci.h           |  20 +
  10 files changed, 2346 insertions(+), 141 deletions(-)

create mode 100644 include/dt-bindings/ata/ahci.h

[...]

Quoted 8 lines
  };
arch/arm/dts/rk3588s-u-boot.dtsi +0 -0
index c703e41802..f8c10227b0 100644
@@ -13,103 +13,12 @@
  		status = "okay";
  	};

arch/arm/dts/rk3588s-u-boot.dtsi line 24

Quoted 10 lines
arch/arm/dts/rk3588s-u-boot.dtsi +0 -9
 
-	usb_host0_ehci: usb@fc800000 {
-		compatible = "generic-ehci";
-		reg = <0x0 0xfc800000 0x0 0x40000>;
-		interrupts = <GIC_SPI 215 IRQ_TYPE_LEVEL_HIGH 0>;
-		clocks = <&cru HCLK_HOST0>, <&cru HCLK_HOST_ARB0>;
-		clock-names = "usbhost", "arbiter";
-		power-domains = <&power RK3588_PD_USB>;
-		status = "disabled";
-	};

No, this has to stay, the new nodes in kernel break usb2 on rk3588 platforms in U-boot. In u-boot, the PHY is not a clock provider. Hence the breakage.
Only when the PHY becomes a clock provider you can remove these nodes here.

Check below the difference which I highlighted:

Quoted 264 lines
arch/arm/dts/rk3588s-u-boot.dtsi +0 -110
-
-	usb_host0_ohci: usb@fc840000 {
-		compatible = "generic-ohci";
-		reg = <0x0 0xfc840000 0x0 0x40000>;
-		interrupts = <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH 0>;
-		clocks = <&cru HCLK_HOST0>, <&cru HCLK_HOST_ARB0>;
-		clock-names = "usbhost", "arbiter";
-		power-domains = <&power RK3588_PD_USB>;
-		status = "disabled";
-	};
-
-	usb_host1_ehci: usb@fc880000 {
-		compatible = "generic-ehci";
-		reg = <0x0 0xfc880000 0x0 0x40000>;
-		interrupts = <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH 0>;
-		clocks = <&cru HCLK_HOST1>, <&cru HCLK_HOST_ARB1>;
-		clock-names = "usbhost", "arbiter";
-		power-domains = <&power RK3588_PD_USB>;
-		status = "disabled";
-	};
-
-	usb_host1_ohci: usb@fc8c0000 {
-		compatible = "generic-ohci";
-		reg = <0x0 0xfc8c0000 0x0 0x40000>;
-		interrupts = <GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH 0>;
-		clocks = <&cru HCLK_HOST1>, <&cru HCLK_HOST_ARB1>;
-		clock-names = "usbhost", "arbiter";
-		power-domains = <&power RK3588_PD_USB>;
-		status = "disabled";
-	};
-
  	pmu1_grf: syscon@fd58a000 {
  		bootph-all;
  		compatible = "rockchip,rk3588-pmu1-grf", "syscon";
  		reg = <0x0 0xfd58a000 0x0 0x2000>;
  	};
 
-	pipe_phy0_grf: syscon@fd5bc000 {
-		compatible = "rockchip,pipe-phy-grf", "syscon";
-		reg = <0x0 0xfd5bc000 0x0 0x100>;
-	};
-
-	usb2phy2_grf: syscon@fd5d8000 {
-		compatible = "rockchip,rk3588-usb2phy-grf", "syscon",
-			     "simple-mfd";
-		reg = <0x0 0xfd5d8000 0x0 0x4000>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		u2phy2: usb2-phy@8000 {
-			compatible = "rockchip,rk3588-usb2phy";
-			reg = <0x8000 0x10>;
-			interrupts = <GIC_SPI 391 IRQ_TYPE_LEVEL_HIGH 0>;
-			clocks = <&cru CLK_USB2PHY_HDPTXRXPHY_REF>;
-			clock-names = "phyclk";
-			#clock-cells = <0>;
-			status = "disabled";
-
-			u2phy2_host: host-port {
-				#phy-cells = <0>;
-				status = "disabled";
-			};
-		};
-	};
-
-	usb2phy3_grf: syscon@fd5dc000 {
-		compatible = "rockchip,rk3588-usb2phy-grf", "syscon",
-			     "simple-mfd";
-		reg = <0x0 0xfd5dc000 0x0 0x4000>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		u2phy3: usb2-phy@c000 {
-			compatible = "rockchip,rk3588-usb2phy";
-			reg = <0xc000 0x10>;
-			interrupts = <GIC_SPI 392 IRQ_TYPE_LEVEL_HIGH 0>;
-			clocks = <&cru CLK_USB2PHY_HDPTXRXPHY_REF>;
-			clock-names = "phyclk";
-			#clock-cells = <0>;
-			status = "disabled";
-
-			u2phy3_host: host-port {
-				#phy-cells = <0>;
-				status = "disabled";
-			};
-		};
-	};
-
  	pcie2x1l2: pcie@fe190000 {
  		compatible = "rockchip,rk3588-pcie", "snps,dw-pcie";
  		#address-cells = <3>;
@@ -174,39 +83,11 @@
  		status = "disabled";
  	};
 
-	otp: nvmem@fecc0000 {
-		compatible = "rockchip,rk3588-otp";
-		reg = <0x0 0xfecc0000 0x0 0x400>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-		status = "okay";
-
-		cpu_id: id@7 {
-			reg = <0x07 0x10>;
-		};
-	};
-
  	rng: rng@fe378000 {
  		compatible = "rockchip,trngv1";
  		reg = <0x0 0xfe378000 0x0 0x200>;
  		status = "disabled";
  	};
-
-	combphy0_ps: phy@fee00000 {
-		compatible = "rockchip,rk3588-naneng-combphy";
-		reg = <0x0 0xfee00000 0x0 0x100>;
-		#phy-cells = <1>;
-		clocks = <&cru CLK_REF_PIPE_PHY0>, <&cru PCLK_PCIE_COMBO_PIPE_PHY0>,
-			 <&cru PCLK_PHP_ROOT>;
-		clock-names = "refclk", "apbclk", "phpclk";
-		assigned-clocks = <&cru CLK_REF_PIPE_PHY0>;
-		assigned-clock-rates = <100000000>;
-		resets = <&cru SRST_P_PCIE2_PHY0>, <&cru SRST_REF_PIPE_PHY0>;
-		reset-names = "combphy-apb", "combphy";
-		rockchip,pipe-grf = <&php_grf>;
-		rockchip,pipe-phy-grf = <&pipe_phy0_grf>;
-		status = "disabled";
-	};
  };
 
  &xin24m {
arch/arm/dts/rk3588s.dtsi +26 -4
index fca8503aed..c9f9dd2472 100644
@@ -8,6 +8,8 @@
  #include <dt-bindings/interrupt-controller/irq.h>
  #include <dt-bindings/power/rk3588-power.h>
  #include <dt-bindings/reset/rockchip,rk3588-cru.h>
+#include <dt-bindings/phy/phy.h>
+#include <dt-bindings/ata/ahci.h>
 
  / {
  	compatible = "rockchip,rk3588";
@@ -60,6 +62,8 @@
  			enable-method = "psci";
  			capacity-dmips-mhz = <530>;
  			clocks = <&scmi_clk SCMI_CLK_CPUL>;
+			assigned-clocks = <&scmi_clk SCMI_CLK_CPUL>;
+			assigned-clock-rates = <816000000>;
  			cpu-idle-states = <&CPU_SLEEP>;
  			i-cache-size = <32768>;
  			i-cache-line-size = <64>;
@@ -136,6 +140,8 @@
  			enable-method = "psci";
  			capacity-dmips-mhz = <1024>;
  			clocks = <&scmi_clk SCMI_CLK_CPUB01>;
+			assigned-clocks = <&scmi_clk SCMI_CLK_CPUB01>;
+			assigned-clock-rates = <816000000>;
  			cpu-idle-states = <&CPU_SLEEP>;
  			i-cache-size = <65536>;
  			i-cache-line-size = <64>;
@@ -174,6 +180,8 @@
  			enable-method = "psci";
  			capacity-dmips-mhz = <1024>;
  			clocks = <&scmi_clk SCMI_CLK_CPUB23>;
+			assigned-clocks = <&scmi_clk SCMI_CLK_CPUB23>;
+			assigned-clock-rates = <816000000>;
  			cpu-idle-states = <&CPU_SLEEP>;
  			i-cache-size = <65536>;
  			i-cache-line-size = <64>;
@@ -222,6 +230,8 @@
  			cache-size = <131072>;
  			cache-line-size = <64>;
  			cache-sets = <512>;
+			cache-level = <2>;
+			cache-unified;
  			next-level-cache = <&l3_cache>;
  		};
 
@@ -230,6 +240,8 @@
  			cache-size = <131072>;
  			cache-line-size = <64>;
  			cache-sets = <512>;
+			cache-level = <2>;
+			cache-unified;
  			next-level-cache = <&l3_cache>;
  		};
 
@@ -238,6 +250,8 @@
  			cache-size = <131072>;
  			cache-line-size = <64>;
  			cache-sets = <512>;
+			cache-level = <2>;
+			cache-unified;
  			next-level-cache = <&l3_cache>;
  		};
 
@@ -246,6 +260,8 @@
  			cache-size = <131072>;
  			cache-line-size = <64>;
  			cache-sets = <512>;
+			cache-level = <2>;
+			cache-unified;
  			next-level-cache = <&l3_cache>;
  		};
 
@@ -254,6 +270,8 @@
  			cache-size = <524288>;
  			cache-line-size = <64>;
  			cache-sets = <1024>;
+			cache-level = <2>;
+			cache-unified;
  			next-level-cache = <&l3_cache>;
  		};
 
@@ -262,6 +280,8 @@
  			cache-size = <524288>;
  			cache-line-size = <64>;
  			cache-sets = <1024>;
+			cache-level = <2>;
+			cache-unified;
  			next-level-cache = <&l3_cache>;
  		};
 
@@ -270,6 +290,8 @@
  			cache-size = <524288>;
  			cache-line-size = <64>;
  			cache-sets = <1024>;
+			cache-level = <2>;
+			cache-unified;
  			next-level-cache = <&l3_cache>;
  		};
 
@@ -278,6 +300,8 @@
  			cache-size = <524288>;
  			cache-line-size = <64>;
  			cache-sets = <1024>;
+			cache-level = <2>;
+			cache-unified;
  			next-level-cache = <&l3_cache>;
  		};
 
@@ -286,6 +310,8 @@
  			cache-size = <3145728>;
  			cache-line-size = <64>;
  			cache-sets = <4096>;
+			cache-level = <3>;
+			cache-unified;
  		};
  	};
 
@@ -304,10 +330,6 @@
 
  			scmi_clk: protocol@14 {
  				reg = <0x14>;
-				assigned-clocks = <&scmi_clk SCMI_CLK_CPUB01>,
-						  <&scmi_clk SCMI_CLK_CPUB23>;
-				assigned-clock-rates = <1200000000>,
-						       <1200000000>;
  				#clock-cells = <1>;
  			};
 

arch/arm/dts/rk3588s.dtsi line 406

Quoted 8 lines
arch/arm/dts/rk3588s.dtsi +5 -0
@@ -377,6 +399,50 @@
  		};
  	};
 
+	usb_host0_ehci: usb@fc800000 {
+		compatible = "rockchip,rk3588-ehci", "generic-ehci";
+		reg = <0x0 0xfc800000 0x0 0x40000>;
+		interrupts = <GIC_SPI 215 IRQ_TYPE_LEVEL_HIGH 0>;
+		clocks = <&cru HCLK_HOST0>, <&cru HCLK_HOST_ARB0>, <&cru ACLK_USB>, <&u2phy2>;

Here ^^

arch/arm/dts/rk3588s.dtsi line 417

Quoted 11 lines
arch/arm/dts/rk3588s.dtsi +11 -0
+		phys = <&u2phy2_host>;
+		phy-names = "usb";
+		power-domains = <&power RK3588_PD_USB>;
+		status = "disabled";
+	};
+
+	usb_host0_ohci: usb@fc840000 {
+		compatible = "rockchip,rk3588-ohci", "generic-ohci";
+		reg = <0x0 0xfc840000 0x0 0x40000>;
+		interrupts = <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH 0>;
+		clocks = <&cru HCLK_HOST0>, <&cru HCLK_HOST_ARB0>, <&cru ACLK_USB>, <&u2phy2>;

And here

arch/arm/dts/rk3588s.dtsi line 428

Quoted 11 lines
arch/arm/dts/rk3588s.dtsi +11 -0
+		phys = <&u2phy2_host>;
+		phy-names = "usb";
+		power-domains = <&power RK3588_PD_USB>;
+		status = "disabled";
+	};
+
+	usb_host1_ehci: usb@fc880000 {
+		compatible = "rockchip,rk3588-ehci", "generic-ehci";
+		reg = <0x0 0xfc880000 0x0 0x40000>;
+		interrupts = <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH 0>;
+		clocks = <&cru HCLK_HOST1>, <&cru HCLK_HOST_ARB1>, <&cru ACLK_USB>, <&u2phy3>;

Ditto

arch/arm/dts/rk3588s.dtsi line 439

Quoted 11 lines
arch/arm/dts/rk3588s.dtsi +11 -0
+		phys = <&u2phy3_host>;
+		phy-names = "usb";
+		power-domains = <&power RK3588_PD_USB>;
+		status = "disabled";
+	};
+
+	usb_host1_ohci: usb@fc8c0000 {
+		compatible = "rockchip,rk3588-ohci", "generic-ohci";
+		reg = <0x0 0xfc8c0000 0x0 0x40000>;
+		interrupts = <GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH 0>;
+		clocks = <&cru HCLK_HOST1>, <&cru HCLK_HOST_ARB1>, <&cru ACLK_USB>, <&u2phy3>;

Ditto

Quoted 6 lines
arch/arm/dts/rk3588s.dtsi +6 -0
+		phys = <&u2phy3_host>;
+		phy-names = "usb";
+		power-domains = <&power RK3588_PD_USB>;
+		status = "disabled";
+	};
+

[...]

author
#5 lore raw
Quoted 35 lines · Eugen Hristev
Quoted 21 lines · Jagan Teki

Sync the linux-next from below commit,
commit <1642bf66e270> ("arm64: dts: rockchip: add USB2 to rk3588s-rock5a")

Also rops the duplicate usb nodes from rk3588s-u-boot.dtsi

---
  arch/arm/dts/rk3588-edgeble-neu6a.dtsi   |   1 -
  arch/arm/dts/rk3588-edgeble-neu6b-io.dts |  66 +++
  arch/arm/dts/rk3588-edgeble-neu6b.dtsi   | 359 ++++++++++-
  arch/arm/dts/rk3588-evb1-v10.dts         | 720 ++++++++++++++++++++++-
  arch/arm/dts/rk3588-rock-5b-u-boot.dtsi  |  13 -
  arch/arm/dts/rk3588-rock-5b.dts          | 578 +++++++++++++++++-
  arch/arm/dts/rk3588.dtsi                 | 112 ++++
  arch/arm/dts/rk3588s-u-boot.dtsi         | 119 ----
  arch/arm/dts/rk3588s.dtsi                | 499 +++++++++++++++-
  include/dt-bindings/ata/ahci.h           |  20 +
  10 files changed, 2346 insertions(+), 141 deletions(-)

create mode 100644 include/dt-bindings/ata/ahci.h

[...]

Quoted 9 lines
  };
arch/arm/dts/rk3588s-u-boot.dtsi +0 -0
index c703e41802..f8c10227b0 100644
@@ -13,103 +13,12 @@
              status = "okay";
      };
 
Quoted 14 lines

arch/arm/dts/rk3588s-u-boot.dtsi line 24

Quoted 9 lines
arch/arm/dts/rk3588s-u-boot.dtsi +0 -9
-     usb_host0_ehci: usb@fc800000 {
-             compatible = "generic-ehci";
-             reg = <0x0 0xfc800000 0x0 0x40000>;
-             interrupts = <GIC_SPI 215 IRQ_TYPE_LEVEL_HIGH 0>;
-             clocks = <&cru HCLK_HOST0>, <&cru HCLK_HOST_ARB0>;
-             clock-names = "usbhost", "arbiter";
-             power-domains = <&power RK3588_PD_USB>;
-             status = "disabled";
-     };

No, this has to stay, the new nodes in kernel break usb2 on rk3588 platforms in U-boot.
In u-boot, the PHY is not a clock provider. Hence the breakage. Only when the PHY becomes a clock provider you can remove these nodes here.

Not really, clock provider in PHY driver is already fixed in Mainline.

Here is the ROCK5B test.

U-Boot 2023.07-00367-g43479b8a69 (Jul 18 2023 - 13:10:42 +0530)

Model: Radxa ROCK 5 Model B
DRAM:  16 GiB (effective 15.7 GiB)
Core:  305 devices, 27 uclasses, devicetree: separate
MMC:   mmc@fe2c0000: 1, mmc@fe2e0000: 0
Loading Environment from nowhere... OK
In:    serial@feb50000
Out:   serial@feb50000
Err:   serial@feb50000
Model: Radxa ROCK 5 Model B
Net:   No ethernet found.
Hit any key to stop autoboot:  0

=> usb start
starting USB...
Bus usb@fc800000: USB EHCI 1.00
Bus usb@fc840000: USB OHCI 1.0
Bus usb@fc880000: USB EHCI 1.00
Bus usb@fc8c0000: USB OHCI 1.0
scanning bus usb@fc800000 for devices... 4 USB Device(s) found scanning bus usb@fc840000 for devices... 1 USB Device(s) found scanning bus usb@fc880000 for devices... 1 USB Device(s) found scanning bus usb@fc8c0000 for devices... 1 USB Device(s) found
scanning usb for storage devices... 2 Storage Device(s) found
=> usb tree
USB device tree:
1 Hub (480 Mb/s, 0mA)
| u-boot EHCI Host Controller
|

  +-2  Hub (480 Mb/s, 100mA)
    |   USB 2.0 Hub
    |
    +-3  Mass Storage (480 Mb/s, 100mA)
    |    SMI Corporation USB DISK AA04012900007464
    |
    +-4  Mass Storage (480 Mb/s, 224mA)
         SanDisk Dual Drive 040130e3ee554b7078843f4eb331646

1 Hub (12 Mb/s, 0mA)
U-Boot Root Hub

1 Hub (480 Mb/s, 0mA)
u-boot EHCI Host Controller

1 Hub (12 Mb/s, 0mA)
U-Boot Root Hub

Thanks,
Jagan.

#6 lore raw
Quoted 102 lines · Jagan Teki
Quoted 35 lines · Eugen Hristev
Quoted 21 lines · Jagan Teki

Sync the linux-next from below commit,
commit <1642bf66e270> ("arm64: dts: rockchip: add USB2 to rk3588s-rock5a")

Also rops the duplicate usb nodes from rk3588s-u-boot.dtsi

---
   arch/arm/dts/rk3588-edgeble-neu6a.dtsi   |   1 -
   arch/arm/dts/rk3588-edgeble-neu6b-io.dts |  66 +++
   arch/arm/dts/rk3588-edgeble-neu6b.dtsi   | 359 ++++++++++-
   arch/arm/dts/rk3588-evb1-v10.dts         | 720 ++++++++++++++++++++++-
   arch/arm/dts/rk3588-rock-5b-u-boot.dtsi  |  13 -
   arch/arm/dts/rk3588-rock-5b.dts          | 578 +++++++++++++++++-
   arch/arm/dts/rk3588.dtsi                 | 112 ++++
   arch/arm/dts/rk3588s-u-boot.dtsi         | 119 ----
   arch/arm/dts/rk3588s.dtsi                | 499 +++++++++++++++-
   include/dt-bindings/ata/ahci.h           |  20 +
   10 files changed, 2346 insertions(+), 141 deletions(-)

create mode 100644 include/dt-bindings/ata/ahci.h

[...]

Quoted 9 lines
   };
arch/arm/dts/rk3588s-u-boot.dtsi +0 -0
index c703e41802..f8c10227b0 100644
@@ -13,103 +13,12 @@
               status = "okay";
       };
 
Quoted 14 lines

arch/arm/dts/rk3588s-u-boot.dtsi line 24

Quoted 9 lines
arch/arm/dts/rk3588s-u-boot.dtsi +0 -9
-     usb_host0_ehci: usb@fc800000 {
-             compatible = "generic-ehci";
-             reg = <0x0 0xfc800000 0x0 0x40000>;
-             interrupts = <GIC_SPI 215 IRQ_TYPE_LEVEL_HIGH 0>;
-             clocks = <&cru HCLK_HOST0>, <&cru HCLK_HOST_ARB0>;
-             clock-names = "usbhost", "arbiter";
-             power-domains = <&power RK3588_PD_USB>;
-             status = "disabled";
-     };

No, this has to stay, the new nodes in kernel break usb2 on rk3588 platforms in U-boot.
In u-boot, the PHY is not a clock provider. Hence the breakage. Only when the PHY becomes a clock provider you can remove these nodes here.

Not really, clock provider in PHY driver is already fixed in Mainline.

Here is the ROCK5B test.

U-Boot 2023.07-00367-g43479b8a69 (Jul 18 2023 - 13:10:42 +0530)

Model: Radxa ROCK 5 Model B
DRAM:  16 GiB (effective 15.7 GiB)
Core:  305 devices, 27 uclasses, devicetree: separate
MMC:   mmc@fe2c0000: 1, mmc@fe2e0000: 0
Loading Environment from nowhere... OK
In:    serial@feb50000
Out:   serial@feb50000
Err:   serial@feb50000
Model: Radxa ROCK 5 Model B
Net:   No ethernet found.
Hit any key to stop autoboot:  0

=> usb start
starting USB...
Bus usb@fc800000: USB EHCI 1.00
Bus usb@fc840000: USB OHCI 1.0
Bus usb@fc880000: USB EHCI 1.00
Bus usb@fc8c0000: USB OHCI 1.0
scanning bus usb@fc800000 for devices... 4 USB Device(s) found scanning bus usb@fc840000 for devices... 1 USB Device(s) found scanning bus usb@fc880000 for devices... 1 USB Device(s) found scanning bus usb@fc8c0000 for devices... 1 USB Device(s) found
scanning usb for storage devices... 2 Storage Device(s) found
=> usb tree
USB device tree:

   1  Hub (480 Mb/s, 0mA)
   |  u-boot EHCI Host Controller
   |
   +-2  Hub (480 Mb/s, 100mA)
     |   USB 2.0 Hub
     |
     +-3  Mass Storage (480 Mb/s, 100mA)
     |    SMI Corporation USB DISK AA04012900007464
     |
     +-4  Mass Storage (480 Mb/s, 224mA)
          SanDisk Dual Drive 040130e3ee554b7078843f4eb331646

   1  Hub (12 Mb/s, 0mA)
       U-Boot Root Hub

   1  Hub (480 Mb/s, 0mA)
      u-boot EHCI Host Controller

   1  Hub (12 Mb/s, 0mA)
       U-Boot Root Hub
Quoted 2 lines

Thanks,
Jagan.

Oh, this is neat. I will try it out, and let you know if I see any issues. Thanks