| Message ID | 20240822-friendlyelec-nanopc-t6-lts-v4-7-892aebcec0c6@linaro.org (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | FriendlyELEC NanoPC-T6 improvements | expand |
Hi Marcin, On 2024-08-22 15:32, Marcin Juszkiewicz wrote: > Enable the USB-C port on FriendlyELEC NanoPC-T6. > > Works one way so far but still better than before. > > Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> > --- > arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 71 ++++++++++++++++++++++ > 1 file changed, 71 insertions(+) > > diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi > index 74dc1b490ca3..e63b2faee3b5 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi > +++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi > @@ -135,6 +135,8 @@ vbus5v0_typec: vbus5v0-typec-regulator { > gpio = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>; > pinctrl-names = "default"; > pinctrl-0 = <&typec5v_pwren>; > + regulator-always-on; > + regulator-boot-on; This should probably not be always-on/boot-on, the connector is described as power-role = "dual" and try-power-role = "sink", so should probably be possible to disable the vbus supply. Regards, Jonas > regulator-name = "vbus5v0_typec"; > regulator-min-microvolt = <5000000>; > regulator-max-microvolt = <5000000>; > @@ -384,6 +386,32 @@ connector { > source-pdos = <PDO_FIXED(5000, 2000, PDO_FIXED_USB_COMM)>; > sink-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>; > op-sink-microwatt = <1000000>; > + > + 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>; > + }; > + }; > + }; > }; > }; > > @@ -927,6 +955,14 @@ &uart2 { > status = "okay"; > }; > > +&u2phy0 { > + status = "okay"; > +}; > + > +&u2phy0_otg { > + status = "okay"; > +}; > + > &u2phy2_host { > phy-supply = <&vdd_4g_3v3>; > status = "okay"; > @@ -944,6 +980,29 @@ &u2phy3 { > status = "okay"; > }; > > +&usbdp_phy0 { > + mode-switch; > + orientation-switch; > + sbu1-dc-gpios = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>; > + sbu2-dc-gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>; > + 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>; > + }; > + }; > +}; > + > &usb_host0_ehci { > status = "okay"; > }; > @@ -952,6 +1011,18 @@ &usb_host0_ohci { > status = "okay"; > }; > > +&usb_host0_xhci { > + dr_mode = "host"; > + status = "okay"; > + usb-role-switch; > + > + port { > + usb_host0_xhci_drd_sw: endpoint { > + remote-endpoint = <&usbc0_hs>; > + }; > + }; > +}; > + > &usb_host1_ehci { > status = "okay"; > }; >
On 22.08.2024 23:07, Jonas Karlman wrote: >> @@ -135,6 +135,8 @@ vbus5v0_typec: vbus5v0-typec-regulator { >> gpio = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>; >> pinctrl-names = "default"; >> pinctrl-0 = <&typec5v_pwren>; >> + regulator-always-on; >> + regulator-boot-on; > This should probably not be always-on/boot-on, the connector is > described as power-role = "dual" and try-power-role = "sink", so should > probably be possible to disable the vbus supply. At same time it is not used for powering the board so probably need to change 'power-role' to something else.
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi index 74dc1b490ca3..e63b2faee3b5 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi @@ -135,6 +135,8 @@ vbus5v0_typec: vbus5v0-typec-regulator { gpio = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&typec5v_pwren>; + regulator-always-on; + regulator-boot-on; regulator-name = "vbus5v0_typec"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; @@ -384,6 +386,32 @@ connector { source-pdos = <PDO_FIXED(5000, 2000, PDO_FIXED_USB_COMM)>; sink-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>; op-sink-microwatt = <1000000>; + + 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>; + }; + }; + }; }; }; @@ -927,6 +955,14 @@ &uart2 { status = "okay"; }; +&u2phy0 { + status = "okay"; +}; + +&u2phy0_otg { + status = "okay"; +}; + &u2phy2_host { phy-supply = <&vdd_4g_3v3>; status = "okay"; @@ -944,6 +980,29 @@ &u2phy3 { status = "okay"; }; +&usbdp_phy0 { + mode-switch; + orientation-switch; + sbu1-dc-gpios = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>; + sbu2-dc-gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>; + 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>; + }; + }; +}; + &usb_host0_ehci { status = "okay"; }; @@ -952,6 +1011,18 @@ &usb_host0_ohci { status = "okay"; }; +&usb_host0_xhci { + dr_mode = "host"; + status = "okay"; + usb-role-switch; + + port { + usb_host0_xhci_drd_sw: endpoint { + remote-endpoint = <&usbc0_hs>; + }; + }; +}; + &usb_host1_ehci { status = "okay"; };
Enable the USB-C port on FriendlyELEC NanoPC-T6. Works one way so far but still better than before. Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> --- arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 71 ++++++++++++++++++++++ 1 file changed, 71 insertions(+)