Re: [PATCH 2/5] arm64: dts: rockchip: move rock 5b to include file

Nicolas Frattaroli
2025-05-08T14:46:56Z

On Monday, 24 March 2025 18:04:23 Central European Summer Time Sebastian Reichel wrote:
> Radxa released some more boards, which are based on the original
> Rock 5B. Move its board description into an include file to avoid
> unnecessary duplication.
>
> NOTE: this should be merged with the previous commit to ensure
> bisectability. The rename happens in a separete commit during
> development because git does not properly detect the rename when
> the original filename is reused in the same commit. This means
>
> 1. it's a lot harder to review the changes
> 2. it's a lot harder to rebase the patch series
>
> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
> ---
> arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 52 ++++++++++++++++++++++++
> arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi | 34 ----------------
> 2 files changed, 52 insertions(+), 34 deletions(-)
>

Hello,

this isn't evident from the diff, but the move + these changes keep
vcc5v0_host_en in pinctrl in the shared .dtsi as far as I can tell. The
follow-up 5b-plus patch has the correct pinctrl as an override, and so
does the regular 5b for its respective vcc5v0_host_en, so it can just be
dropped from the shared .dtsi pinctrl.

Additionally, sbu1-dc-gpios and sbu2-dc-gpios need to be moved from the
shared .dtsi into rk3588-rock-5b.dts. The rest of the usbdp_phy0 node
is fine to stay in your shared dtsi, but in the follow-up rock-5b-plus.dts
patch, the rock-5b-plus.dts needs the sbu1 GPIO set to GPIO0 C4 and the
sbu2 GPIO set to GPIO0 C5.

Regards,
Nicolas Frattaroli