| Message ID | 20241017200039.1235524-4-jonas@kwiboo.se |
|---|---|
| State | Accepted |
| Commit | 9a614e1b3d166b55bc0ae9e04876ce8c5199b315 |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | rockchip: Add support for FriendlyElec NanoPC-T6 LTS | expand |
On 2024/10/18 04:00, Jonas Karlman wrote: > From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> > > In the LTS (2310) version the miniPCIe slot got removed and USB 2.0 > setup has changed. There are two external accessible ports and two ports > on the internal header. > > There is an on-board USB hub which provides: > - one external connector (bottom one) > - two internal ports on pin header > - one port for m.2 E connector > > The top USB 2.0 connector comes directly from the SoC. > > Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> > Link: https://lore.kernel.org/r/20240829-friendlyelec-nanopc-t6-lts-v6-4-edff247e8c02@linaro.org > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > > [ upstream commit: db1dcbe5f752d423421f77d54d246398b196f670 ] > > (cherry picked from commit f4a834fbc8cdb40fddd63d083e8d1c6189ba62dc) > Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > .../arm64/rockchip/rk3588-nanopc-t6-lts.dts | 60 +++++++++++++++++++ > 1 file changed, 60 insertions(+) > create mode 100644 dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6-lts.dts > > diff --git a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6-lts.dts b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6-lts.dts > new file mode 100644 > index 000000000000..2d92bbb4027d > --- /dev/null > +++ b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6-lts.dts > @@ -0,0 +1,60 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > +/* > + * Copyright (c) 2021 Rockchip Electronics Co., Ltd. > + * Copyright (c) 2023 Thomas McKahan > + * Copyright (c) 2024 Linaro Ltd. > + * > + */ > + > +/dts-v1/; > + > +#include "rk3588-nanopc-t6.dtsi" > + > +/ { > + model = "FriendlyElec NanoPC-T6 LTS"; > + compatible = "friendlyarm,nanopc-t6-lts", "rockchip,rk3588"; > + > + /* provide power for on-board USB 2.0 hub */ > + vcc5v0_usb20_host: vcc5v0-usb20-host-regulator { > + compatible = "regulator-fixed"; > + enable-active-high; > + gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; > + pinctrl-0 = <&usb20_host_pwren>; > + pinctrl-names = "default"; > + regulator-always-on; > + regulator-boot-on; > + regulator-max-microvolt = <5000000>; > + regulator-min-microvolt = <5000000>; > + regulator-name = "vcc5v0_usb20_host"; > + vin-supply = <&vcc5v0_sys>; > + }; > +}; > + > +&pinctrl { > + usb { > + usb20_host_pwren: usb20-host-pwren { > + rockchip,pins = <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>; > + }; > + }; > +}; > + > +&u2phy1 { > + status = "okay"; > +}; > + > +&u2phy1_otg { > + status = "okay"; > +}; > + > +&u2phy2_host { > + phy-supply = <&vcc5v0_usb20_host>; > +}; > + > +&usbdp_phy1 { > + status = "okay"; > +}; > + > +&usb_host1_xhci { > + dr_mode = "host"; > + status = "okay"; > +};
diff --git a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6-lts.dts b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6-lts.dts new file mode 100644 index 000000000000..2d92bbb4027d --- /dev/null +++ b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6-lts.dts @@ -0,0 +1,60 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2021 Rockchip Electronics Co., Ltd. + * Copyright (c) 2023 Thomas McKahan + * Copyright (c) 2024 Linaro Ltd. + * + */ + +/dts-v1/; + +#include "rk3588-nanopc-t6.dtsi" + +/ { + model = "FriendlyElec NanoPC-T6 LTS"; + compatible = "friendlyarm,nanopc-t6-lts", "rockchip,rk3588"; + + /* provide power for on-board USB 2.0 hub */ + vcc5v0_usb20_host: vcc5v0-usb20-host-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; + pinctrl-0 = <&usb20_host_pwren>; + pinctrl-names = "default"; + regulator-always-on; + regulator-boot-on; + regulator-max-microvolt = <5000000>; + regulator-min-microvolt = <5000000>; + regulator-name = "vcc5v0_usb20_host"; + vin-supply = <&vcc5v0_sys>; + }; +}; + +&pinctrl { + usb { + usb20_host_pwren: usb20-host-pwren { + rockchip,pins = <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; +}; + +&u2phy1 { + status = "okay"; +}; + +&u2phy1_otg { + status = "okay"; +}; + +&u2phy2_host { + phy-supply = <&vcc5v0_usb20_host>; +}; + +&usbdp_phy1 { + status = "okay"; +}; + +&usb_host1_xhci { + dr_mode = "host"; + status = "okay"; +};