On 7/18/23 10:44, Jagan Teki wrote:
On Tue, 18 Jul 2023 at 02:36, Eugen Hristev eugen.hristev@collabora.com wrote:
On 7/17/23 18:42, Jagan Teki wrote:
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
Signed-off-by: Jagan Teki jagan@edgeble.ai
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
[...]
}; diff --git a/arch/arm/dts/rk3588s-u-boot.dtsi b/arch/arm/dts/rk3588s-u-boot.dtsi index c703e41802..f8c10227b0 100644 --- a/arch/arm/dts/rk3588s-u-boot.dtsi +++ b/arch/arm/dts/rk3588s-u-boot.dtsi @@ -13,103 +13,12 @@ status = "okay"; };
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.
Oh, this is neat. I will try it out, and let you know if I see any issues. Thanks