github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-24 15:12:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

arm64: dts: rockchip: add usb typec host support to rk3588-jaguar

Browse Source 
Jaguar has two type-c ports connected to fusb302 controllers that can
work both in host and device mode and can also run in display-port
altmode.

While these ports can work in dual-role data mode, they do not support
powering the device itself as power-sink. This causes issues because
the current infrastructure does not cope well with dual-role data
without dual-role power.

So add the necessary nodes for the type-c controllers as well as enable
the relevant core usb nodes. So far host modes works reliably, but
device-mode does not. So devicemode needs more investigation.

Signed-off-by: Heiko Stuebner <heiko.stuebner@cherry.de>
Tested-by: Quentin Schulz <quentin.schulz@cherry.de>
Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de>
Link: https://lore.kernel.org/r/20250228150853.329175-1-heiko@sntech.de
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
This commit is contained in:
Heiko Stuebner 2025-02-28 16:08:53 +01:00 committed by Heiko Stuebner
parent f94500eb73
commit c55c9e91d1
1 changed files with 218 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

218
arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts
View File

@ -333,6 +333,56 @@ rtc_twi: rtc@6f {
};
};
typec-portc@22 {
compatible = "fcs,fusb302";
reg = <0x22>;
interrupt-parent = <&gpio4>;
interrupts = <RK_PA3 IRQ_TYPE_LEVEL_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&cc_int1>;
vbus-supply = <&vcc_5v0_usb_c1>;
connector {
compatible = "usb-c-connector";
data-role = "dual";
label = "USBC-1 P11";
power-role = "source";
self-powered;
source-pdos =
<PDO_FIXED(5000, 1500, PDO_FIXED_DATA_SWAP | PDO_FIXED_USB_COMM)>;
vbus-supply = <&vcc_5v0_usb_c1>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
usbc0_hs: endpoint {
remote-endpoint = <&usb_host0_xhci_drd_sw>;
};
};
port@1 {
reg = <1>;
usbc0_ss: endpoint {
remote-endpoint = <&usbdp_phy0_typec_ss>;
};
};
port@2 {
reg = <2>;
usbc0_sbu: endpoint {
remote-endpoint = <&usbdp_phy0_typec_sbu>;
};
};
};
};
};
vdd_npu_s0: regulator@42 {
compatible = "rockchip,rk8602";
reg = <0x42>;
@ -394,6 +444,56 @@ &i2c8 {
pinctrl-0 = <&i2c8m2_xfer>;
status = "okay";
typec-portc@22 {
compatible = "fcs,fusb302";
reg = <0x22>;
interrupt-parent = <&gpio4>;
interrupts = <RK_PA4 IRQ_TYPE_LEVEL_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&cc_int2>;
vbus-supply = <&vcc_5v0_usb_c2>;
connector {
compatible = "usb-c-connector";
data-role = "dual";
label = "USBC-2 P12";
power-role = "source";
self-powered;
source-pdos =
<PDO_FIXED(5000, 1500, PDO_FIXED_DATA_SWAP | PDO_FIXED_USB_COMM)>;
vbus-supply = <&vcc_5v0_usb_c2>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
usbc1_hs: endpoint {
remote-endpoint = <&usb_host1_xhci_drd_sw>;
};
};
port@1 {
reg = <1>;
usbc1_ss: endpoint {
remote-endpoint = <&usbdp_phy1_typec_ss>;
};
};
port@2 {
reg = <2>;
usbc1_sbu: endpoint {
remote-endpoint = <&usbdp_phy1_typec_sbu>;
};
};
};
};
};
vdd_cpu_big0_s0: regulator@42 {
compatible = "rockchip,rk8602";
reg = <0x42>;
@ -487,6 +587,26 @@ pcie30x4_waken_m0: pcie30x4-waken-m0 {
rockchip,pins = <0 RK_PC7 12 &pcfg_pull_none>;
};
};
usb3 {
cc_int1: cc-int1 {
rockchip,pins = <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
};
cc_int2: cc-int2 {
rockchip,pins = <4 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
};
typec0_sbu_dc_pins: typec0-sbu-dc-pins {
rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_down>,
<1 RK_PC3 RK_FUNC_GPIO &pcfg_pull_down>;
};
typec1_sbu_dc_pins: typec1-sbu-dc-pins {
rockchip,pins = <0 RK_PD4 RK_FUNC_GPIO &pcfg_pull_down>,
<1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
};
&saradc {
@ -855,6 +975,24 @@ &tsadc {
status = "okay";
};
/* USB-C P11 connector */
&u2phy0 {
status = "okay";
};
&u2phy0_otg {
status = "okay";
};
/* USB-C P12 connector */
&u2phy1 {
status = "okay";
};
&u2phy1_otg {
status = "okay";
};
&u2phy2 {
status = "okay";
};
@ -897,6 +1035,56 @@ &uart7 {
status = "okay";
};
/* Type-C on P11 */
&usbdp_phy0 {
orientation-switch;
pinctrl-names = "default";
pinctrl-0 = <&typec0_sbu_dc_pins>;
sbu1-dc-gpios = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>; /* Q7_USB_C0_SBU1_DC */
sbu2-dc-gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_HIGH>; /* Q7_USB_C0_SBU2_DC */
status = "okay";
port {
#address-cells = <1>;
#size-cells = <0>;
usbdp_phy0_typec_ss: endpoint@0 {
reg = <0>;
remote-endpoint = <&usbc0_ss>;
};
usbdp_phy0_typec_sbu: endpoint@1 {
reg = <1>;
remote-endpoint = <&usbc0_sbu>;
};
};
};
/* Type-C on P12 */
&usbdp_phy1 {
orientation-switch;
pinctrl-names = "default";
pinctrl-0 = <&typec1_sbu_dc_pins>;
sbu1-dc-gpios = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>; /* Q7_USB_C1_SBU1_DC */
sbu2-dc-gpios = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>; /* Q7_USB_C1_SBU2_DC */
status = "okay";
port {
#address-cells = <1>;
#size-cells = <0>;
usbdp_phy1_typec_ss: endpoint@0 {
reg = <0>;
remote-endpoint = <&usbc1_ss>;
};
usbdp_phy1_typec_sbu: endpoint@1 {
reg = <1>;
remote-endpoint = <&usbc1_sbu>;
};
};
};
/* host0 on P10 USB-A */
&usb_host0_ehci {
status = "okay";
@ -907,6 +1095,36 @@ &usb_host0_ohci {
status = "okay";
};
/* host0 on P11 USB-C */
&usb_host0_xhci {
usb-role-switch;
status = "okay";
port {
#address-cells = <1>;
#size-cells = <0>;
usb_host0_xhci_drd_sw: endpoint {
remote-endpoint = <&usbc0_hs>;
};
};
};
/* host1 on P12 USB-C */
&usb_host1_xhci {
usb-role-switch;
status = "okay";
port {
#address-cells = <1>;
#size-cells = <0>;
usb_host1_xhci_drd_sw: endpoint {
remote-endpoint = <&usbc1_hs>;
};
};
};
/* host1 on M.2 E-key */
&usb_host1_ehci {
status = "okay";