| Message ID | 20241025175415.887368-1-wens@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | arm64: dts: rockchip: orangepi-5-plus: Enable USB 3.0 ports | expand |
Hello Chen-Yu, On Sat, Oct 26, 2024 at 01:54:15AM GMT, Chen-Yu Tsai wrote: > From: Chen-Yu Tsai <wens@csie.org> > > The Orange Pi 5 Plus has its first USB 3.0 interface on the SoC wired > directly to the USB type C port next to the MASKROM button, and the > second interface wired to a USB 3.0 hub which in turn is connected to > the USB 3.0 host ports on the board, as well as the USB 2.0 connection > on the M.2 E-key slot. > > Signed-off-by: Chen-Yu Tsai <wens@csie.org> CCing the DTS author would be nice. :) Thanks for submitting this. I found a few issues. See below: > --- > .../dts/rockchip/rk3588-orangepi-5-plus.dts | 132 ++++++++++++++++++ > 1 file changed, 132 insertions(+) > > diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts > index dd03c9db6953..b826c5e368aa 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts > +++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts > @@ -177,6 +177,18 @@ daicodec: simple-audio-card,codec { > }; > }; > > + vbus_typec: vbus-typec-regulator { > + compatible = "regulator-fixed"; > + enable-active-high; > + gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>; > + pinctrl-names = "default"; > + pinctrl-0 = <&typec5v_pwren>; > + regulator-name = "vbus_typec"; This is named vbus5v0_typec in the schematic. > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + vin-supply = <&vcc5v0_sys>; > + }; > + > vcc3v3_pcie30: vcc3v3-pcie30-regulator { > compatible = "regulator-fixed"; > enable-active-high; > @@ -339,6 +351,56 @@ &i2c6 { > clock-frequency = <400000>; > status = "okay"; > > + usbc0: usb-typec@22 { > + compatible = "fcs,fusb302"; > + reg = <0x22>; > + interrupt-parent = <&gpio0>; > + interrupts = <RK_PD3 IRQ_TYPE_LEVEL_LOW>; > + pinctrl-names = "default"; > + pinctrl-0 = <&usbc0_int>; > + vbus-supply = <&vbus_typec>; > + status = "okay"; > + > + usb_con: connector { > + compatible = "usb-c-connector"; > + label = "USB-C"; > + data-role = "dual"; > + op-sink-microwatt = <1000000>; > + power-role = "dual"; > + sink-pdos = > + <PDO_FIXED(5000, 1000, PDO_FIXED_USB_COMM)>; The board can't sink power from this port. It's a source only port. So sink-pdos can be lower, so that if you plug this into type-c hub as a peripheral, the hub doesn't need to reserve 5W for this port. op-sink-microwat can also be lower. The port will not sink any power when connected to 5V VBUS externally. Otherwise you can probably keep power-role = "dual"; > + source-pdos = > + <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>; This port can't source 3A. U22 (SY6280AAC) is configured via Rset for 1.44A limit. So let's say 1.5A. > + try-power-role = "source"; > + > + 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>; > + }; > + }; > + }; > + }; > + }; > + > hym8563: rtc@51 { > compatible = "haoyu,hym8563"; > reg = <0x51>; > @@ -480,6 +542,16 @@ vcc5v0_usb20_en: vcc5v0-usb20-en { > rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>; > }; > }; > + > + usb-typec { > + usbc0_int: usbc0-int { > + rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>; > + }; > + > + typec5v_pwren: typec5v-pwren { > + rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; > + }; > + }; > }; > > &pwm2 { > @@ -871,6 +943,22 @@ &tsadc { > status = "okay"; > }; > > +&u2phy0 { > + status = "okay"; > +}; > + > +&u2phy0_otg { > + status = "okay"; > +}; > + > +&u2phy1 { > + status = "okay"; > +}; > + > +&u2phy1_otg { Needs: phy-supply = <&vcc5v0_host>; > + status = "okay"; > +}; > + > &u2phy2 { > status = "okay"; > }; > @@ -899,6 +987,33 @@ &uart9 { > 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>; > + }; > + }; > +}; > + > +&usbdp_phy1 { > + status = "okay"; > +}; > + > &usb_host0_ehci { > status = "okay"; > }; > @@ -907,6 +1022,18 @@ &usb_host0_ohci { > status = "okay"; > }; > > +&usb_host0_xhci { > + dr_mode = "otg"; This is the default. No need to have it here. Kind regards, o. > + usb-role-switch; > + status = "okay"; > + > + port { > + usb_host0_xhci_drd_sw: endpoint { > + remote-endpoint = <&usbc0_hs>; > + }; > + }; > +}; > + > &usb_host1_ehci { > status = "okay"; > }; > @@ -915,6 +1042,11 @@ &usb_host1_ohci { > status = "okay"; > }; > > +&usb_host1_xhci { > + dr_mode = "host"; > + status = "okay"; > +}; > + > &vop_mmu { > status = "okay"; > }; > -- > 2.39.5 >
On Mon, Oct 28, 2024 at 6:47 AM Ondřej Jirman <megi@xff.cz> wrote: > > Hello Chen-Yu, > > On Sat, Oct 26, 2024 at 01:54:15AM GMT, Chen-Yu Tsai wrote: > > From: Chen-Yu Tsai <wens@csie.org> > > > > The Orange Pi 5 Plus has its first USB 3.0 interface on the SoC wired > > directly to the USB type C port next to the MASKROM button, and the > > second interface wired to a USB 3.0 hub which in turn is connected to > > the USB 3.0 host ports on the board, as well as the USB 2.0 connection > > on the M.2 E-key slot. > > > > Signed-off-by: Chen-Yu Tsai <wens@csie.org> > > CCing the DTS author would be nice. :) Ack. > Thanks for submitting this. I found a few issues. See below: > > > --- > > .../dts/rockchip/rk3588-orangepi-5-plus.dts | 132 ++++++++++++++++++ > > 1 file changed, 132 insertions(+) > > > > diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts > > index dd03c9db6953..b826c5e368aa 100644 > > --- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts > > +++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts > > @@ -177,6 +177,18 @@ daicodec: simple-audio-card,codec { > > }; > > }; > > > > + vbus_typec: vbus-typec-regulator { > > + compatible = "regulator-fixed"; > > + enable-active-high; > > + gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>; > > + pinctrl-names = "default"; > > + pinctrl-0 = <&typec5v_pwren>; > > + regulator-name = "vbus_typec"; > > This is named vbus5v0_typec in the schematic. Ack. > > + regulator-min-microvolt = <5000000>; > > + regulator-max-microvolt = <5000000>; > > + vin-supply = <&vcc5v0_sys>; > > + }; > > + > > vcc3v3_pcie30: vcc3v3-pcie30-regulator { > > compatible = "regulator-fixed"; > > enable-active-high; > > @@ -339,6 +351,56 @@ &i2c6 { > > clock-frequency = <400000>; > > status = "okay"; > > > > + usbc0: usb-typec@22 { > > + compatible = "fcs,fusb302"; > > + reg = <0x22>; > > + interrupt-parent = <&gpio0>; > > + interrupts = <RK_PD3 IRQ_TYPE_LEVEL_LOW>; > > + pinctrl-names = "default"; > > + pinctrl-0 = <&usbc0_int>; > > + vbus-supply = <&vbus_typec>; > > + status = "okay"; > > + > > + usb_con: connector { > > + compatible = "usb-c-connector"; > > + label = "USB-C"; > > + data-role = "dual"; > > + op-sink-microwatt = <1000000>; > > + power-role = "dual"; > > + sink-pdos = > > + <PDO_FIXED(5000, 1000, PDO_FIXED_USB_COMM)>; > > The board can't sink power from this port. It's a source only port. So sink-pdos > can be lower, so that if you plug this into type-c hub as a peripheral, the hub > doesn't need to reserve 5W for this port. > > op-sink-microwat can also be lower. The port will not sink any power when > connected to 5V VBUS externally. > > Otherwise you can probably keep power-role = "dual"; I guess it should just be power-role = "source"; And then drop all the sink related properties. > > + source-pdos = > > + <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>; > > This port can't source 3A. U22 (SY6280AAC) is configured via Rset for 1.44A > limit. So let's say 1.5A. Probably 1.4A to be safe? > > + try-power-role = "source"; > > + > > + 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>; > > + }; > > + }; > > + }; > > + }; > > + }; > > + > > hym8563: rtc@51 { > > compatible = "haoyu,hym8563"; > > reg = <0x51>; > > @@ -480,6 +542,16 @@ vcc5v0_usb20_en: vcc5v0-usb20-en { > > rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>; > > }; > > }; > > + > > + usb-typec { > > + usbc0_int: usbc0-int { > > + rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>; > > + }; > > + > > + typec5v_pwren: typec5v-pwren { > > + rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; > > + }; > > + }; > > }; > > > > &pwm2 { > > @@ -871,6 +943,22 @@ &tsadc { > > status = "okay"; > > }; > > > > +&u2phy0 { > > + status = "okay"; > > +}; > > + > > +&u2phy0_otg { > > + status = "okay"; > > +}; > > + > > +&u2phy1 { > > + status = "okay"; > > +}; > > + > > +&u2phy1_otg { > > Needs: > phy-supply = <&vcc5v0_host>; You probably mean vcc5v0_sys? The power switch that feeds the ports is controlled by the hub directly. The hub is powered off vcc5v0_sys. > > + status = "okay"; > > +}; > > + > > &u2phy2 { > > status = "okay"; > > }; > > @@ -899,6 +987,33 @@ &uart9 { > > 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>; > > + }; > > + }; > > +}; > > + > > +&usbdp_phy1 { > > + status = "okay"; > > +}; > > + > > &usb_host0_ehci { > > status = "okay"; > > }; > > @@ -907,6 +1022,18 @@ &usb_host0_ohci { > > status = "okay"; > > }; > > > > +&usb_host0_xhci { > > + dr_mode = "otg"; > > This is the default. No need to have it here. Ack. Thanks ChenYu > Kind regards, > o. > > > + usb-role-switch; > > + status = "okay"; > > + > > + port { > > + usb_host0_xhci_drd_sw: endpoint { > > + remote-endpoint = <&usbc0_hs>; > > + }; > > + }; > > +}; > > + > > &usb_host1_ehci { > > status = "okay"; > > }; > > @@ -915,6 +1042,11 @@ &usb_host1_ohci { > > status = "okay"; > > }; > > > > +&usb_host1_xhci { > > + dr_mode = "host"; > > + status = "okay"; > > +}; > > + > > &vop_mmu { > > status = "okay"; > > }; > > -- > > 2.39.5 > >
Hi, On Fri, Nov 08, 2024 at 12:16:57AM GMT, Chen-Yu Tsai wrote: > On Mon, Oct 28, 2024 at 6:47 AM Ondřej Jirman <megi@xff.cz> wrote: > > > > > + > > > + usb_con: connector { > > > + compatible = "usb-c-connector"; > > > + label = "USB-C"; > > > + data-role = "dual"; > > > + op-sink-microwatt = <1000000>; > > > + power-role = "dual"; > > > + sink-pdos = > > > + <PDO_FIXED(5000, 1000, PDO_FIXED_USB_COMM)>; > > > > The board can't sink power from this port. It's a source only port. So sink-pdos > > can be lower, so that if you plug this into type-c hub as a peripheral, the hub > > doesn't need to reserve 5W for this port. > > > > op-sink-microwat can also be lower. The port will not sink any power when > > connected to 5V VBUS externally. > > > > Otherwise you can probably keep power-role = "dual"; > > I guess it should just be power-role = "source"; > And then drop all the sink related properties. Probably not. The board is not powered from that port, but I should still be able to plug it via that port to a PC, and in that case it should not act as power source (vbus should be disabled), because PC's port will provide power. (say via USB-A <-> USB-C cable connected to PC's USB host port) It should still be capable of being in power sink mode on that port, but it will just not physically sink anything. Just the board's vbus will be disabled. We should just describe that in sink mode it will not sink much of anything. > > > + source-pdos = > > > + <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>; > > > > This port can't source 3A. U22 (SY6280AAC) is configured via Rset for 1.44A > > limit. So let's say 1.5A. > > Probably 1.4A to be safe? Ok. > > > +&u2phy1 { > > > + status = "okay"; > > > +}; > > > + > > > +&u2phy1_otg { > > > > Needs: > > phy-supply = <&vcc5v0_host>; > > You probably mean vcc5v0_sys? Sorry, ignore this request completely. I was mis-looking at quartzpro DTS, when reviewing this part of the patch. Thank you, o.
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts index dd03c9db6953..b826c5e368aa 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts @@ -177,6 +177,18 @@ daicodec: simple-audio-card,codec { }; }; + vbus_typec: vbus-typec-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&typec5v_pwren>; + regulator-name = "vbus_typec"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + vin-supply = <&vcc5v0_sys>; + }; + vcc3v3_pcie30: vcc3v3-pcie30-regulator { compatible = "regulator-fixed"; enable-active-high; @@ -339,6 +351,56 @@ &i2c6 { clock-frequency = <400000>; status = "okay"; + usbc0: usb-typec@22 { + compatible = "fcs,fusb302"; + reg = <0x22>; + interrupt-parent = <&gpio0>; + interrupts = <RK_PD3 IRQ_TYPE_LEVEL_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&usbc0_int>; + vbus-supply = <&vbus_typec>; + status = "okay"; + + usb_con: connector { + compatible = "usb-c-connector"; + label = "USB-C"; + data-role = "dual"; + op-sink-microwatt = <1000000>; + power-role = "dual"; + sink-pdos = + <PDO_FIXED(5000, 1000, PDO_FIXED_USB_COMM)>; + source-pdos = + <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>; + try-power-role = "source"; + + 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>; + }; + }; + }; + }; + }; + hym8563: rtc@51 { compatible = "haoyu,hym8563"; reg = <0x51>; @@ -480,6 +542,16 @@ vcc5v0_usb20_en: vcc5v0-usb20-en { rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>; }; }; + + usb-typec { + usbc0_int: usbc0-int { + rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>; + }; + + typec5v_pwren: typec5v-pwren { + rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; }; &pwm2 { @@ -871,6 +943,22 @@ &tsadc { status = "okay"; }; +&u2phy0 { + status = "okay"; +}; + +&u2phy0_otg { + status = "okay"; +}; + +&u2phy1 { + status = "okay"; +}; + +&u2phy1_otg { + status = "okay"; +}; + &u2phy2 { status = "okay"; }; @@ -899,6 +987,33 @@ &uart9 { 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>; + }; + }; +}; + +&usbdp_phy1 { + status = "okay"; +}; + &usb_host0_ehci { status = "okay"; }; @@ -907,6 +1022,18 @@ &usb_host0_ohci { status = "okay"; }; +&usb_host0_xhci { + dr_mode = "otg"; + usb-role-switch; + status = "okay"; + + port { + usb_host0_xhci_drd_sw: endpoint { + remote-endpoint = <&usbc0_hs>; + }; + }; +}; + &usb_host1_ehci { status = "okay"; }; @@ -915,6 +1042,11 @@ &usb_host1_ohci { status = "okay"; }; +&usb_host1_xhci { + dr_mode = "host"; + status = "okay"; +}; + &vop_mmu { status = "okay"; };