[v2] arm64: dts: rockchip: add ROCK 5B+ support

[PATCH v2 0/5] arm64: dts: rockchip: add ROCK 5B+ support

Posted by Sebastian Reichel 7 months, 1 week ago

This series adds support for the ROCK 5B+, which (as the name suggests)
is an improved version of the ROCK 5B. It also adds initial USB-C
support for both the ROCK 5B and the 5B+.

Changes in PATCHv2:
 - Link to v1: https://lore.kernel.org/r/20250324-rock5bp-for-upstream-v1-0-6217edf15b19@kernel.org
 - Replaced DT binding patch with the version from NAOKI
 - Dropped unused pinctrl for vcc5v0_host_en from the shared DT
 - Moved USB-C SBU DC pins to board specific files, since they differ
   between Rock 5B and Rock 5B+
 - Added pinmux for SBU DC pins
 - Rebased to latest version of Heiko's for-next branch
 - Disable USB-C on Rock 5B for now

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
FUKAUMI Naoki (1):
      dt-bindings: arm: rockchip: Add Radxa ROCK 5B+

Sebastian Reichel (4):
      arm64: dts: rockchip: move rock 5b to include file
      arm64: dts: rockchip: move rock 5b to include file
      arm64: dts: rockchip: add Rock 5B+
      arm64: dts: rockchip: add USB-C support for ROCK 5B+

 .../devicetree/bindings/arm/rockchip.yaml          |    5 +
 arch/arm64/boot/dts/rockchip/Makefile              |    1 +
 .../boot/dts/rockchip/rk3588-rock-5b-plus.dts      |  129 +++
 arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts    |  970 +-----------------
 arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi   | 1082 ++++++++++++++++++++
 5 files changed, 1247 insertions(+), 940 deletions(-)
---
base-commit: b7caeb9545db25649eda36ce593b70cc2aa804ab
change-id: 20250324-rock5bp-for-upstream-fd85b00b593b

Best regards,
-- 
Sebastian Reichel <sre@kernel.org>

Re: [PATCH v2 0/5] arm64: dts: rockchip: add ROCK 5B+ support

Posted by Rob Herring (Arm) 7 months, 1 week ago

On Thu, 08 May 2025 19:48:49 +0200, Sebastian Reichel wrote:
> This series adds support for the ROCK 5B+, which (as the name suggests)
> is an improved version of the ROCK 5B. It also adds initial USB-C
> support for both the ROCK 5B and the 5B+.
> 
> Changes in PATCHv2:
>  - Link to v1: https://lore.kernel.org/r/20250324-rock5bp-for-upstream-v1-0-6217edf15b19@kernel.org
>  - Replaced DT binding patch with the version from NAOKI
>  - Dropped unused pinctrl for vcc5v0_host_en from the shared DT
>  - Moved USB-C SBU DC pins to board specific files, since they differ
>    between Rock 5B and Rock 5B+
>  - Added pinmux for SBU DC pins
>  - Rebased to latest version of Heiko's for-next branch
>  - Disable USB-C on Rock 5B for now
> 
> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
> ---
> FUKAUMI Naoki (1):
>       dt-bindings: arm: rockchip: Add Radxa ROCK 5B+
> 
> Sebastian Reichel (4):
>       arm64: dts: rockchip: move rock 5b to include file
>       arm64: dts: rockchip: move rock 5b to include file
>       arm64: dts: rockchip: add Rock 5B+
>       arm64: dts: rockchip: add USB-C support for ROCK 5B+
> 
>  .../devicetree/bindings/arm/rockchip.yaml          |    5 +
>  arch/arm64/boot/dts/rockchip/Makefile              |    1 +
>  .../boot/dts/rockchip/rk3588-rock-5b-plus.dts      |  129 +++
>  arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts    |  970 +-----------------
>  arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi   | 1082 ++++++++++++++++++++
>  5 files changed, 1247 insertions(+), 940 deletions(-)
> ---
> base-commit: b7caeb9545db25649eda36ce593b70cc2aa804ab
> change-id: 20250324-rock5bp-for-upstream-fd85b00b593b
> 
> Best regards,
> --
> Sebastian Reichel <sre@kernel.org>
> 
> 
> 


My bot found new DTB warnings on the .dts files added or changed in this
series.

Some warnings may be from an existing SoC .dtsi. Or perhaps the warnings
are fixed by another series. Ultimately, it is up to the platform
maintainer whether these warnings are acceptable or not. No need to reply
unless the platform maintainer has comments.

If you already ran DT checks and didn't see these error(s), then
make sure dt-schema is up to date:

  pip3 install dtschema --upgrade


This patch series was applied (using b4) to base:
 Base: base-commit b7caeb9545db25649eda36ce593b70cc2aa804ab not known, ignoring
 Base: attempting to guess base-commit...
 Base: tags/v6.15-rc1-40-g425af91c5802 (best guess, 2/3 blobs matched)

If this is not the correct base, please add 'base-commit' tag
(or use b4 which does this automatically)

New warnings running 'make CHECK_DTBS=y for arch/arm64/boot/dts/rockchip/' for 20250508-rock5bp-for-upstream-v2-0-677033cc1ac2@kernel.org:

arch/arm64/boot/dts/rockchip/rk3588-rock-5b-plus.dtb: /edp@fdec0000: failed to match any schema with compatible: ['rockchip,rk3588-edp']
arch/arm64/boot/dts/rockchip/rk3588-rock-5b-plus.dtb: /edp@fded0000: failed to match any schema with compatible: ['rockchip,rk3588-edp']

Re: [PATCH v2 0/5] arm64: dts: rockchip: add ROCK 5B+ support

Posted by Heiko Stübner 7 months, 1 week ago

Am Freitag, 9. Mai 2025, 16:17:02 Mitteleuropäische Sommerzeit schrieb Rob Herring (Arm):
> 
> On Thu, 08 May 2025 19:48:49 +0200, Sebastian Reichel wrote:
> > This series adds support for the ROCK 5B+, which (as the name suggests)
> > is an improved version of the ROCK 5B. It also adds initial USB-C
> > support for both the ROCK 5B and the 5B+.
> > 
> > Changes in PATCHv2:
> >  - Link to v1: https://lore.kernel.org/r/20250324-rock5bp-for-upstream-v1-0-6217edf15b19@kernel.org
> >  - Replaced DT binding patch with the version from NAOKI
> >  - Dropped unused pinctrl for vcc5v0_host_en from the shared DT
> >  - Moved USB-C SBU DC pins to board specific files, since they differ
> >    between Rock 5B and Rock 5B+
> >  - Added pinmux for SBU DC pins
> >  - Rebased to latest version of Heiko's for-next branch
> >  - Disable USB-C on Rock 5B for now
> > 
> > Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
> > ---
> > FUKAUMI Naoki (1):
> >       dt-bindings: arm: rockchip: Add Radxa ROCK 5B+
> > 
> > Sebastian Reichel (4):
> >       arm64: dts: rockchip: move rock 5b to include file
> >       arm64: dts: rockchip: move rock 5b to include file
> >       arm64: dts: rockchip: add Rock 5B+
> >       arm64: dts: rockchip: add USB-C support for ROCK 5B+
> > 
> >  .../devicetree/bindings/arm/rockchip.yaml          |    5 +
> >  arch/arm64/boot/dts/rockchip/Makefile              |    1 +
> >  .../boot/dts/rockchip/rk3588-rock-5b-plus.dts      |  129 +++
> >  arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts    |  970 +-----------------
> >  arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi   | 1082 ++++++++++++++++++++
> >  5 files changed, 1247 insertions(+), 940 deletions(-)
> > ---
> > base-commit: b7caeb9545db25649eda36ce593b70cc2aa804ab
> > change-id: 20250324-rock5bp-for-upstream-fd85b00b593b
> > 
> > Best regards,
> > --
> > Sebastian Reichel <sre@kernel.org>
> > 
> > 
> > 
> 
> 
> My bot found new DTB warnings on the .dts files added or changed in this
> series.
> 
> Some warnings may be from an existing SoC .dtsi. Or perhaps the warnings
> are fixed by another series. Ultimately, it is up to the platform
> maintainer whether these warnings are acceptable or not. No need to reply
> unless the platform maintainer has comments.
> 
> If you already ran DT checks and didn't see these error(s), then
> make sure dt-schema is up to date:
> 
>   pip3 install dtschema --upgrade
> 
> 
> This patch series was applied (using b4) to base:
>  Base: base-commit b7caeb9545db25649eda36ce593b70cc2aa804ab not known, ignoring
>  Base: attempting to guess base-commit...
>  Base: tags/v6.15-rc1-40-g425af91c5802 (best guess, 2/3 blobs matched)
> 
> If this is not the correct base, please add 'base-commit' tag
> (or use b4 which does this automatically)
> 
> New warnings running 'make CHECK_DTBS=y for arch/arm64/boot/dts/rockchip/' for 20250508-rock5bp-for-upstream-v2-0-677033cc1ac2@kernel.org:
> 
> arch/arm64/boot/dts/rockchip/rk3588-rock-5b-plus.dtb: /edp@fdec0000: failed to match any schema with compatible: ['rockchip,rk3588-edp']
> arch/arm64/boot/dts/rockchip/rk3588-rock-5b-plus.dtb: /edp@fded0000: failed to match any schema with compatible: ['rockchip,rk3588-edp']

This should be already fixed by the rk3588-edp addition in linux-next:
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=f855146263b14abadd8d5bd0e280e54fbab3bd18

Re: [PATCH v2 0/5] arm64: dts: rockchip: add ROCK 5B+ support

Posted by Sebastian Reichel 7 months, 1 week ago

Hi,

On Fri, May 09, 2025 at 05:12:22PM +0200, Heiko Stübner wrote:
> Am Freitag, 9. Mai 2025, 16:17:02 Mitteleuropäische Sommerzeit schrieb Rob Herring (Arm):
> > 
> > On Thu, 08 May 2025 19:48:49 +0200, Sebastian Reichel wrote:
> > > This series adds support for the ROCK 5B+, which (as the name suggests)
> > > is an improved version of the ROCK 5B. It also adds initial USB-C
> > > support for both the ROCK 5B and the 5B+.
> > > 
> > > Changes in PATCHv2:
> > >  - Link to v1: https://lore.kernel.org/r/20250324-rock5bp-for-upstream-v1-0-6217edf15b19@kernel.org
> > >  - Replaced DT binding patch with the version from NAOKI
> > >  - Dropped unused pinctrl for vcc5v0_host_en from the shared DT
> > >  - Moved USB-C SBU DC pins to board specific files, since they differ
> > >    between Rock 5B and Rock 5B+
> > >  - Added pinmux for SBU DC pins
> > >  - Rebased to latest version of Heiko's for-next branch
> > >  - Disable USB-C on Rock 5B for now
> > > 
> > > Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
> > > ---
> > > FUKAUMI Naoki (1):
> > >       dt-bindings: arm: rockchip: Add Radxa ROCK 5B+
> > > 
> > > Sebastian Reichel (4):
> > >       arm64: dts: rockchip: move rock 5b to include file
> > >       arm64: dts: rockchip: move rock 5b to include file
> > >       arm64: dts: rockchip: add Rock 5B+
> > >       arm64: dts: rockchip: add USB-C support for ROCK 5B+
> > > 
> > >  .../devicetree/bindings/arm/rockchip.yaml          |    5 +
> > >  arch/arm64/boot/dts/rockchip/Makefile              |    1 +
> > >  .../boot/dts/rockchip/rk3588-rock-5b-plus.dts      |  129 +++
> > >  arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts    |  970 +-----------------
> > >  arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi   | 1082 ++++++++++++++++++++
> > >  5 files changed, 1247 insertions(+), 940 deletions(-)
> > > ---
> > > base-commit: b7caeb9545db25649eda36ce593b70cc2aa804ab
> > > change-id: 20250324-rock5bp-for-upstream-fd85b00b593b
> > > 
> > > Best regards,
> > > --
> > > Sebastian Reichel <sre@kernel.org>
> > > 
> > > 
> > > 
> > 
> > 
> > My bot found new DTB warnings on the .dts files added or changed in this
> > series.
> > 
> > Some warnings may be from an existing SoC .dtsi. Or perhaps the warnings
> > are fixed by another series. Ultimately, it is up to the platform
> > maintainer whether these warnings are acceptable or not. No need to reply
> > unless the platform maintainer has comments.
> > 
> > If you already ran DT checks and didn't see these error(s), then
> > make sure dt-schema is up to date:
> > 
> >   pip3 install dtschema --upgrade
> > 
> > 
> > This patch series was applied (using b4) to base:
> >  Base: base-commit b7caeb9545db25649eda36ce593b70cc2aa804ab not known, ignoring
> >  Base: attempting to guess base-commit...
> >  Base: tags/v6.15-rc1-40-g425af91c5802 (best guess, 2/3 blobs matched)
> >
> > If this is not the correct base, please add 'base-commit' tag
> > (or use b4 which does this automatically)

Looks like I missed that the rebase to your latest for-next
branch kept one patch, which you dropped ("Revert "dt-bindings: mfd:
syscon: Add rk3528 QoS register compatible") resulting in the
unknown base commit being specified by b4. FWIW the real base commit
would have been e8adbfc19627.

> > New warnings running 'make CHECK_DTBS=y for arch/arm64/boot/dts/rockchip/' for 20250508-rock5bp-for-upstream-v2-0-677033cc1ac2@kernel.org:
> > 
> > arch/arm64/boot/dts/rockchip/rk3588-rock-5b-plus.dtb: /edp@fdec0000: failed to match any schema with compatible: ['rockchip,rk3588-edp']
> > arch/arm64/boot/dts/rockchip/rk3588-rock-5b-plus.dtb: /edp@fded0000: failed to match any schema with compatible: ['rockchip,rk3588-edp']
> 
> This should be already fixed by the rk3588-edp addition in linux-next:
> https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=f855146263b14abadd8d5bd0e280e54fbab3bd18

In any case it's unrelated to this series, since neither the ROCK
5B, nor the 5B+ use or reference the edp node at all.

Makes me wonder, if it would also have triggered with the correct
base (since the eDP DT binding is not in that branch).

-- Sebastian

Re: (subset) [PATCH v2 0/5] arm64: dts: rockchip: add ROCK 5B+ support

Posted by Heiko Stuebner 7 months, 1 week ago

On Thu, 08 May 2025 19:48:49 +0200, Sebastian Reichel wrote:
> This series adds support for the ROCK 5B+, which (as the name suggests)
> is an improved version of the ROCK 5B. It also adds initial USB-C
> support for both the ROCK 5B and the 5B+.
> 
> Changes in PATCHv2:
>  - Link to v1: https://lore.kernel.org/r/20250324-rock5bp-for-upstream-v1-0-6217edf15b19@kernel.org
>  - Replaced DT binding patch with the version from NAOKI
>  - Dropped unused pinctrl for vcc5v0_host_en from the shared DT
>  - Moved USB-C SBU DC pins to board specific files, since they differ
>    between Rock 5B and Rock 5B+
>  - Added pinmux for SBU DC pins
>  - Rebased to latest version of Heiko's for-next branch
>  - Disable USB-C on Rock 5B for now
> 
> [...]

Applied, thanks!

[1/5] arm64: dts: rockchip: move rock 5b to include file
      commit: aadfbdcf7e1e7f3892e0e4bdcc3c9c7c9adfb723
[2/5] arm64: dts: rockchip: move rock 5b to include file
      commit: aadfbdcf7e1e7f3892e0e4bdcc3c9c7c9adfb723

The two above squashed together as intended and talked about
on IRC.

[3/5] dt-bindings: arm: rockchip: Add Radxa ROCK 5B+
      commit: 874c1117621d441e0ef4a609665f228a4b8a1932
[4/5] arm64: dts: rockchip: add Rock 5B+
      commit: 376cb9696298df2028afb620a9dc6c4b10a18605

Best regards,
-- 
Heiko Stuebner <heiko@sntech.de>