arm64: dts: rockchip: Enable all 3 USBs on Turing RK1
Subsystems (2)
PATCH v2 1/1 arm64: dts: rockchip: Enable all 3 USBs on Turing RK1
The Turing RK1 contains 3 different USBs:
- USB0: USB 2.0, OTG
- USB1: USB 3.0, host
- USB2: USB 2.0, host
This patch activates the necessary DT nodes to enable all 3 buses.
Future work will be needed on USB0: it is not USB3-capable, so the USB0 controller needs to be told that there is no USB3 port. Per Jonas's suggestion, the USBDP0 node is given a rockchip,dp-lane-mux property that tells the USBDP driver that USBDP0 is not involved in USB so that it can make the necessary configuration changes in hardware. Technically, this is USB *controller* configuration, not *PHY* configuration, so the underlying code may be moved in the future to the USB controller driver instead, freeing up the (software) dependency on USBDP0. A TODO comment is added to explain this.
---
Happy Monday folks,
This is an updated version of one patch broken out from my previous series [1] that enables USB on the Turing RK1 SoM.
Changes v1->v2:
- rockchip,dp-lane-mux added to tell USBDP0 explicitly that it is not involved in USB (thanks Jonas)
- Comment updated to more accurately reflect the situation, and to use one- not two-space-per-sentence style.
Kind regards,
Sam
[1]: https://lore.kernel.org/lkml/[email protected]/T/
--- .../boot/dts/rockchip/rk3588-turing-rk1.dtsi | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+)
arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi +65 -0
@@ -683,3 +683,68 @@ &uart9 { pinctrl-0 = <&uart9m0_xfer>; status = "okay"; }; + +/* USB 0: USB 2.0 only, OTG-capable */ +&u2phy0 { + status = "okay"; +}; + +&u2phy0_otg { + status = "okay"; +}; + +&usbdp_phy0 { + /* + * TODO: On the RK1, USBDP0 drives the DisplayPort pins and is not + * involved in this USB2-only bus. The bus controller (below) needs to + * know that it doesn't have a USB3 port so it can ignore any + * USB3-related signals. This is handled in hardware by updating the + * GRFs corresponding to that bus controller. Alas, Linux currently + * puts the code to do that in the USBDP driver, so USBDP0 must be + * enabled for now. + */ + status = "okay"; + rockchip,dp-lane-mux = <0 1 2 3>; /* "No USB lanes" */ +}; + +&usb_host0_xhci { + extcon = <&u2phy0>; + maximum-speed = "high-speed"; + status = "okay"; +}; + +/* USB 1: USB 3.0, host only */ +&u2phy1 { + status = "okay"; +}; + +&u2phy1_otg { + status = "okay"; +}; + +&usbdp_phy1 { + status = "okay"; +}; + +&usb_host1_xhci { + extcon = <&u2phy1>; + dr_mode = "host"; + status = "okay"; +}; + +/* USB 2: USB 2.0, host only */ +&u2phy2 { + status = "okay"; +}; + +&u2phy2_host { + status = "okay"; +}; + +&usb_host0_ehci { + status = "okay"; +}; + +&usb_host0_ohci { + status = "okay"; +};
Signature · 1 line
2.44.2
Quoted 8 lines · Sam Edwards
The Turing RK1 contains 3 different USBs:
- USB0: USB 2.0, OTG
- USB1: USB 3.0, host
- USB2: USB 2.0, hostThis patch activates the necessary DT nodes to enable all 3 buses.
[...]
Applied, thanks!
[1/1] arm64: dts: rockchip: Enable all 3 USBs on Turing RK1
commit: 6d14287746d1b5783ee69b3841838e1af5e44dd1
Best regards,
Signature · 1 line
Heiko Stuebner <[email protected]>