Skip to contentSkip to conversation

Rockchip dts64 changes for 6.16 #1

GIT PULL Heiko Stuebner 2 participants 4 messages May 7, 2025 – May 10, 2025

Subsystems (2)
lore
Share & tools
lore

Heiko Stuebner

author maintainer
#0 lore raw

Hi soc maintainers,

please find below and in a subsequent pull-requests Rockchip changes for for 6.16 .

Even some arm32 boards got some love (in the next PR)

Please pull.
Thanks
Heiko

The following changes since commit 0af2f6be1b4281385b618cb86ad946eded089ac8:

Linux 6.15-rc1 (2025-04-06 13:11:33 -0700)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git tags/v6.16-rockchip-dts64-1

for you to fetch changes up to a706a593cb19796f31d3a888423ef1a71885ae72:

arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3566-rock3c (2025-05-07 08:31:09 +0200)

----------------------------------------------------------------
- New boards: rk3588-evb2, rk3588-tiger-haikou-video-demo-overlay
- New peripherals: RNG+PCIe+SATA on rk3576; eDP on rk3588; DMA+I2C+PWM on rk3528; DSI on rk3588
- SPI-flash binding got a supply-property, so a number of boards add this supply.
- RK3588 wrongly declared the shared memory with SCMI in the peripheral space - moved to the correct reserved-memory structure now.
- The rest is peripheral enablement accross many boards - like hdmi output for a big number of boards, regulators, eeprom, etc.

----------------------------------------------------------------
Andy Yan (6):
arm64: dts: rockchip: aliase sdhci as mmc0 for rk3566 box demo
arm64: dts: rockchip: Rename hdmi-con to hdmi0-con for Cool Pi CM5 EVB
arm64: dts: rockchip: Enable HDMI1 on Cool Pi CM5 EVB
arm64: dts: rockchip: Enable HDMI audio outputs for Cool Pi CM5 EVB
arm64: dts: rockchip: Add eDP1 dt node for rk3588
arm64: dts: rockchip: Enable eDP display for Cool Pi GenBook

Chaoyi Chen (2):
dt-bindings: arm: rockchip: Add rk3588 evb2 board
arm64: dts: rockchip: Add rk3588 evb2 board

Chris Morgan (1):
arm64: dts: rockchip: Enable HDMI0 audio output for Indiedroid Nova

Chukun Pan (6):
arm64: dts: rockchip: Add missing uart3 interrupt for RK3528
arm64: dts: rockchip: Add DMA controller for RK3528
arm64: dts: rockchip: Add UART DMA support for RK3528
arm64: dts: rockchip: Move SHMEM memory to reserved memory on rk3588
arm64: dts: rockchip: Add pwm nodes for RK3528
arm64: dts: rockchip: Enable regulators for Radxa E20C

Damon Ding (2):
arm64: dts: rockchip: Add eDP0 node for RK3588
arm64: dts: rockchip: Enable eDP0 display on RK3588S EVB1 board

Diederik de Haas (6):
arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3328-rock64
arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3399-rockpro64
arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3566-pinetab2
arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3588-rock-5b
arm64: dts: rockchip: Add phy-supply to gmac0 on NanoPi R5S
arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3566-quartz64-b

Heiko Stuebner (5):
arm64: dts: rockchip: change rng reset id back to its constant value
arm64: dts: rockchip: add mipi dcphy nodes to rk3588
arm64: dts: rockchip: add dsi controller nodes on rk3588
arm64: dts: rockchip: add overlay for tiger-haikou video-demo adapter
arm64: dts: rockchip: Add HDMI support for roc-rk3576-pc

Jacobe Zang (3):
arm64: dts: rockchip: Add bluetooth support to Khadas Edge2
arm64: dts: rockchip: Add HDMI & VOP2 to Khadas Edge2
arm64: dts: rockchip: enable HDMI out audio on Khadas Edge2

Jianfeng Liu (1):
arm64: dts: rockchip: Enable HDMI ports on ArmSoM W3

Jimmy Hon (1):
arm64: dts: rockchip: Enable bluetooth of AP6611s on OrangePI5 Max/Ultra

John Clark (1):
arm64: dts: rockchip: fix usb-c port functionality on rk3588-nanopc-t6

Kever Yang (1):
arm64: dts: rockchip: Add rk3576 pcie nodes

Krzysztof Kozlowski (1):
arm64: dts: rockchip: Switch to undeprecated qcom,calibration-variant on RK3399

Marcin Juszkiewicz (2):
arm64: dts: rockchip: enable HDMI1 on FriendlyElec NanoPC-T6
arm64: dts: rockchip: enable HDMI sound on FriendlyElec NanoPC-T6

Markus Reichl (1):
arm64: dts: rockchip: Add vcc supply to spi flash on rk3399-roc-pc

Nicolas Frattaroli (3):
arm64: dts: rockchip: enable pcie on Sige5
arm64: dts: rockchip: add SATA nodes to RK3576
arm64: dts: rockchip: add RK3576 RNG node

Peter Robinson (1):
arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3566-rock3c

Quentin Schulz (2):
arm64: dts: rockchip: Enable HDMI audio output for RK3588 Jaguar
arm64: dts: rockchip: Enable HDMI audio output for RK3588 Tiger Haikou

Shawn Lin (3):
arm64: dts: rockchip: Enable ufshc on rk3576 evb1 board
arm64: dts: rockchip: Rename vcc3v3_pcie0 to vcc3v3_pcie1 for rk3576-evb1-v10
arm64: dts: rockchip: Add pcie1 slot for rk3576 evb1 board

Uwe Kleine-König (2):
arm64: dts: rockchip: Correct gmac phy address on QNAP TS433
arm64: dts: rockchip: Add gmac phy reset GPIO to QNAP TS433

Yao Zi (2):
arm64: dts: rockchip: Add I2C controllers for RK3528
arm64: dts: rockchip: Add onboard EEPROM for Radxa E20C

.../devicetree/bindings/arm/rockchip.yaml | 4 +-

 arch/arm64/boot/dts/rockchip/Makefile              |   6 +
 arch/arm64/boot/dts/rockchip/rk3328-rock64.dts     |   1 +
 .../boot/dts/rockchip/rk3399-gru-scarlet-dumo.dts  |   2 +-
 arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi    |   1 +
 arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi |   1 +
 arch/arm64/boot/dts/rockchip/rk3528-radxa-e20c.dts |  87 ++
 arch/arm64/boot/dts/rockchip/rk3528.dtsi           | 219 ++++-
 arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts   |   6 +-
 arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi  |   1 +
 arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts |   1 +
 arch/arm64/boot/dts/rockchip/rk3566-rock-3c.dts    |   1 +
 arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts |   1 +
 arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts |  15 +-
 .../boot/dts/rockchip/rk3576-armsom-sige5.dts      |  23 +
 arch/arm64/boot/dts/rockchip/rk3576-evb1-v10.dts   |  17 +-
 arch/arm64/boot/dts/rockchip/rk3576-roc-pc.dts     |  47 ++
 arch/arm64/boot/dts/rockchip/rk3576.dtsi           | 146 ++++
 arch/arm64/boot/dts/rockchip/rk3588-armsom-w3.dts  | 101 +++
 arch/arm64/boot/dts/rockchip/rk3588-base.dtsi      | 144 +++-
 .../boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts    |  62 +-
 .../dts/rockchip/rk3588-coolpi-cm5-genbook.dts     |  47 ++
 arch/arm64/boot/dts/rockchip/rk3588-evb2-v10.dts   | 931 +++++++++++++++++++++
 arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi     |  28 +
 arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts     |   8 +
 arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi |  75 +-
 .../dts/rockchip/rk3588-orangepi-5-compact.dtsi    |  36 +
 arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts    |   1 +
 .../rockchip/rk3588-tiger-haikou-video-demo.dtso   | 153 ++++
 .../boot/dts/rockchip/rk3588-tiger-haikou.dts      |   8 +
 arch/arm64/boot/dts/rockchip/rk3588s-evb1-v10.dts  |  55 ++
 .../boot/dts/rockchip/rk3588s-indiedroid-nova.dts  |   8 +
 .../boot/dts/rockchip/rk3588s-khadas-edge2.dts     |  77 +-
 33 files changed, 2281 insertions(+), 32 deletions(-)
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-evb2-v10.dts
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou-video-demo.dtso
#1 lore raw
Quoted 6 lines · Heiko Stuebner

Hi soc maintainers,

please find below and in a subsequent pull-requests Rockchip changes for for 6.16 .

Even some arm32 boards got some love (in the next PR)

One small issue stuck out here:

Quoted 2 lines

Yao Zi (2):
arm64: dts: rockchip: Add I2C controllers for RK3528

This creates a lot of new aliases in the dtsi file:

index 826f9be0be19..2c9780069af9 100644

arch/arm64/boot/dts/rockchip/rk3528.dtsi +8 -0
@@ -24,6 +24,14 @@ aliases {
                gpio2 = &gpio2;
                gpio3 = &gpio3;
                gpio4 = &gpio4;
+               i2c0 = &i2c0;
+               i2c1 = &i2c1;
+               i2c2 = &i2c2;
+               i2c3 = &i2c3;
+               i2c4 = &i2c4;
+               i2c5 = &i2c5;
+               i2c6 = &i2c6;
+               i2c7 = &i2c7;
                serial0 = &uart0;
                serial1 = &uart1;
 

but the corresponding nodes are left at disabled. I see that the same mistake is present in the uart nodes.

Please send a fixup to remove these from the .dtsi file here and the similar chips, unless you are sure that every board will have them enabled (like e.g. the gpio nodes).

The aliases are not meant to refer to soc-internal names, but the identifiers on board.

Arnd

author maintainer
#2 lore raw

Hi Arnd,

Am Freitag, 9. Mai 2025, 23:03:54 Mitteleuropäische Sommerzeit schrieb Arnd Bergmann:

Quoted 37 lines · Heiko Stuebner
Quoted 6 lines

Hi soc maintainers,

please find below and in a subsequent pull-requests Rockchip changes for for 6.16 .

Even some arm32 boards got some love (in the next PR)

One small issue stuck out here:

Quoted 2 lines

Yao Zi (2):
arm64: dts: rockchip: Add I2C controllers for RK3528

This creates a lot of new aliases in the dtsi file:

index 826f9be0be19..2c9780069af9 100644

arch/arm64/boot/dts/rockchip/rk3528.dtsi +8 -0
@@ -24,6 +24,14 @@ aliases {
                gpio2 = &gpio2;
                gpio3 = &gpio3;
                gpio4 = &gpio4;
+               i2c0 = &i2c0;
+               i2c1 = &i2c1;
+               i2c2 = &i2c2;
+               i2c3 = &i2c3;
+               i2c4 = &i2c4;
+               i2c5 = &i2c5;
+               i2c6 = &i2c6;
+               i2c7 = &i2c7;
                serial0 = &uart0;
                serial1 = &uart1;
 

but the corresponding nodes are left at disabled. I see that the same mistake is present in the uart nodes.

Quoted 6 lines

Please send a fixup to remove these from the .dtsi file here and the similar chips, unless you are sure that every board will have them enabled (like e.g. the gpio nodes).

The aliases are not meant to refer to soc-internal names, but the identifiers on board.

For the uarts and i2c (and spi), all the identifiers are always numerical both in the SoC documentation as well as on the boards and board schematics.

If you look in a random Rockchip schematic file, the lines for the i2c0 controller will be called i2c0_scl_foo, i2c0_sda_foo, etc. Similar uart0_tx, uart0_rx, etc.

So while I fully understand that mmc0 -> emmc, mmc1 -> sd-card are very much board specific, somehow repeating the very same i2c aliases for every board feels strange. The 7th i2c controller on the soc, will never be called anything else than i2c7 afterall.

But ok, if you feel strongly about that, I'll move the i2c and uart aliases.

Heiko

#3 lore raw
Quoted 16 lines · Heiko Stübner

Am Freitag, 9. Mai 2025, 23:03:54 Mitteleuropäische Sommerzeit schrieb

Quoted 10 lines

but the corresponding nodes are left at disabled. I see that the same mistake is present in the uart nodes.

Please send a fixup to remove these from the .dtsi file here and the similar chips, unless you are sure that every board will have them enabled (like e.g. the gpio nodes).

The aliases are not meant to refer to soc-internal names, but the identifiers on board.

For the uarts and i2c (and spi), all the identifiers are always numerical both in the SoC documentation as well as on the boards and board schematics.

Quoted 8 lines

If you look in a random Rockchip schematic file, the lines for the i2c0 controller will be called i2c0_scl_foo, i2c0_sda_foo, etc. Similar uart0_tx, uart0_rx, etc.

So while I fully understand that mmc0 -> emmc, mmc1 -> sd-card are very much board specific, somehow repeating the very same i2c aliases for every board feels strange. The 7th i2c controller on the soc, will never be called anything else than i2c7 afterall.

It's usually most important for the uart, since that tends to go to an external connector on the board that may use a different numbering, or may not even use the one you named serial0, so these are renumbered most of the time.

For i2c, I can see a reason for keeping the numbering the same as the on-chip pins, but only have an alias for those that are actually enabled. We should probably have dtc check that there are no aliases to disabled devices, but that requires cleaning up a load of board files first.

Quoted 1 line

But ok, if you feel strongly about that, I'll move the i2c and uart aliases.

Yes, please do.

Arnd