Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

6.1-rkr1: sync FriendlyElec's DTs from vendor (common, R6S, R6C, T6, CM3588) + add T6-LTS DT #207

Conversation

rpardini
Copy link
Member

@rpardini rpardini commented Jul 14, 2024

arm64: dts: sync FriendlyElec's DTs from vendor source (common, R6S, R6C, T6, CM3588)

  • From vendor's tree at https://github.com/friendlyarm/kernel-rockchip branch nanopi6-v6.1.y sha1 925eb8ba4c765d4282a7281ddc6559a6e45c2687
  • adapt nomenclature, pull changes that seem to make sense, drop the ones we've explicitly done in Armbian fork

arm64: dts: add FriendlyElec's rk3588-nanopc-t6-lts DT

  • the "T6 LTS" has a different regulator for USB2
  • From vendor's tree at https://github.com/friendlyarm/kernel-rockchip branch nanopi6-v6.1.y sha1 925eb8ba4c765d4282a7281ddc6559a6e45c2687
  • Adapted vendor's nomenclature (rev07 -> rk3588-nanopc-t6-lts.dts)
      - adapted include (rev01 -> rk3588-nanopc-t6.dts)
      - dropped &mach node that is vendor-specific
  • this requires the vcc5v0_host20_en node added in previous commit to the t6 DT
  • add to Makefile

…R6C, T6, CM3588)

- From vendor's tree at https://github.com/friendlyarm/kernel-rockchip branch nanopi6-v6.1.y sha1 925eb8ba4c765d4282a7281ddc6559a6e45c2687
- adapt nomenclature, pull changes that seem to make sense, drop the ones we've explicitly done in Armbian fork
@rpardini rpardini marked this pull request as draft July 14, 2024 10:17
- From vendor's tree at https://github.com/friendlyarm/kernel-rockchip branch nanopi6-v6.1.y sha1 925eb8ba4c765d4282a7281ddc6559a6e45c2687
- Adapted vendor's nomenclature (rev07 -> rk3588-nanopc-t6-lts.dts)
  - adapted include (rev01 -> rk3588-nanopc-t6.dts)
  - dropped `&mach` that is vendor specific
- this requires the `vcc5v0_host20_en` node added in previous commit to the `t6` DT
- add to Makefile
@rpardini rpardini force-pushed the armbian-rk-6.1-rkr1-20240714-sync-nanopi6 branch from b00bf48 to ae2d00e Compare July 14, 2024 10:27
/* @TODO: FE has display_subsystem different:
&display_subsystem {
clocks = <&hdptxphy_hdmi0>, <&hdptxphy_hdmi0>;
clock-names = "hdmi0_phy_pll", "hdmi1_phy_pll";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is only necessary for the boards have 2 HDMI outs

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense. I guess FriendlyElec devs are economizing: more devices have 2 HDMI inputs so they rather duplicate/override those that don't.

@rpardini
Copy link
Member Author

built and tested on-device (T6 LTS), where this does fix the USB2. (soon to go figure out mainline equiv, but no usb (2/3/C) works there at all so I wanted to check with vendor kernel)

I could distill this to the new DT for the LTS version and move the pin definition (that FE did at the base T6) there and keep this isolated if ya'll prefer.

I'm unsure and can't really test the other changes/boards, which seem fairly minor: edid, fans, enable some 40-pin pins, trcm-sync-tx-only (?) and global avsd and rkvtunnel -- no idea what those are.

let me know.

@rpardini rpardini marked this pull request as ready for review July 15, 2024 06:01
@nyanmisaka
Copy link
Collaborator

and global avsd and rkvtunnel -- no idea what those are.

avs2 video decoder => a Chinese video codec to avoid patent issues in h26x codec, performance similar to hevc/h265.

If this is not enabled, in recent mpp libraries, a warning will be thrown in journalctl even when not using avs2. So ideally it would be best to enable it for all rk3588 boards.

rock-5a mpp[3336]: mpp_platform: client 12 driver is not ready!

rkvtunnel => ROCKCHIP videotunnel driver, not sure how to use too

@amazingfate
Copy link
Collaborator

We have bumped to 6.1 rkr3, closing now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants