[PATCH v2 00/22] rockchip: rk3399: Sync DT with v6.8 and update defconfigs

Jonas Karlman jonas at kwiboo.se
Wed May 1 18:22:17 CEST 2024


This series adds support for new clocks used in Linux kernel v6.8 DTs,
sync device trees with v6.8 and updates board defconfigs to enable
common features that is known to be working on RK3399 boards.

A follow up series will be sent that fully move RK3399 and a few other
RK SoCs that recently synced DTs to v6.8 to use OF_UPSTREAM.

Changes in v2:
- Split series in two, this is the second part
- Implement partial instead of dummy support for SCLK_PCIEPHY_REF
- Temporarily add ethernet0 alias to rk3399-u-boot.dtsi
- Keep dfi node for all boot phases
- Only enable AHCI/SCSI on boards that have PCIe slot or board vendor
  sell a SATA HAT
- Collect r-b tags

I have runtime tested this series on following devices:
- 96boards Rock960
- Khadas Edge Captain
- Pine64 PineBook Pro
- Pine64 RockPro64
- Radxa ROCK 4C+
- Radxa ROCK 4SE
- Radxa ROCK Pi 4A
- Radxa ROCK Pi 4B+

Boot times after this series using rock-pi-4-rk3399:

  => bootstage report
  Timer summary in microseconds (12 records):
         Mark    Elapsed  Stage
                 172,783  SPL
      434,458    261,675  end phase
        8,810      8,810  board_init_f
    1,381,128  1,372,318  board_init_r
    2,304,264    923,136  eth_common_init
    2,472,339    168,075  eth_initialize
    2,479,534      7,195  main_loop
    2,479,847        313  cli_loop
  
  Accumulated time:
                  29,672  dm_spl
                 893,082  dm_f
                  12,854  of_live
                  13,792  dm_r

This series depends on the following series:
- rockchip: rk3399: Fix loading FIT from SD-card when booting from eMMC [1]

A copy of this series and its depend can be found at [2]

[1] https://patchwork.ozlabs.org/cover/1929673/
[2] https://github.com/Kwiboo/u-boot-rockchip/commits/rk3399-dt-sync-v2-part2

Jonas Karlman (22):
  clk: rockchip: rk3399: Rename SCLK_DDRCLK to SCLK_DDRC
  clk: rockchip: rk3399: Add dummy support for ACLK_VDU clock
  clk: rockchip: rk3399: Improve support for SCLK_PCIEPHY_REF clock
  clk: rockchip: rk3399: Add SCLK_USB3OTGx_REF support
  rockchip: rk3399: Sync SoC DT from Linux kernel v6.8
  rockchip: rk3399-gru: Sync DT from Linux kernel v6.8
  rockchip: rk3399-puma: Sync DT from Linux kernel v6.8
  rockchip: rk3399-rock-pi-n10: Sync DT from v6.8 and update defconfig
  rockchip: rk3399-eaidk-610: Sync DT from v6.8 and update defconfig
  rockchip: rk3399-leez: Sync DT from v6.8 and update defconfig
  rockchip: rk3399-evb: Sync DT from v6.8 and update defconfig
  rockchip: rk3399-firefly: Sync DT from v6.8 and update defconfig
  rockchip: rk3399-orangepi: Sync DT from v6.8 and update defconfig
  rockchip: rk3399-roc-pc: Sync DT from v6.8 and update defconfig
  rockchip: rk3399-nanopi-4: Sync DT from v6.8 and update defconfig
  rockchip: rk3399-rock960: Sync DT from v6.8 and update defconfig
  rockchip: rk3399-khadas: Sync DT from v6.8 and update defconfig
  rockchip: rk3399-rock-pi-4: Sync DT from v6.8 and update defconfig
  rockchip: rk3399-rockpro64: Sync DT from v6.8 and update defconfig
  rockchip: rk3399-pinebook-pro: Sync DT from v6.8 and update defconfig
  rockchip: rk3399-pinephone-pro: Sync DT from v6.8 and update defconfig
  rockchip: rk3399: Drop ethernet0 alias from SoC u-boot.dtsi

 arch/arm/dts/rk3288-vmarc-som.dtsi            |  48 +++
 arch/arm/dts/rk3399-eaidk-610.dts             |   3 +-
 arch/arm/dts/rk3399-evb-u-boot.dtsi           |  11 +-
 arch/arm/dts/rk3399-evb.dts                   |   3 +-
 arch/arm/dts/rk3399-ficus.dts                 |   4 +
 arch/arm/dts/rk3399-firefly.dts               |  17 +-
 arch/arm/dts/rk3399-gru-bob.dts               |   8 +-
 arch/arm/dts/rk3399-gru-chromebook.dtsi       | 200 +++++++++++-
 arch/arm/dts/rk3399-gru-kevin.dts             |   3 +-
 arch/arm/dts/rk3399-gru-u-boot.dtsi           |  10 +-
 arch/arm/dts/rk3399-gru.dtsi                  |  52 +++-
 arch/arm/dts/rk3399-khadas-edge-captain.dts   |   4 +
 arch/arm/dts/rk3399-khadas-edge-u-boot.dtsi   |   5 +
 arch/arm/dts/rk3399-khadas-edge-v.dts         |   4 +
 arch/arm/dts/rk3399-khadas-edge.dtsi          |  10 +-
 arch/arm/dts/rk3399-leez-p710.dts             |   8 +-
 arch/arm/dts/rk3399-nanopc-t4.dts             |   2 +-
 arch/arm/dts/rk3399-nanopi-m4-2gb.dts         |  55 +---
 arch/arm/dts/rk3399-nanopi-m4b.dts            |   2 +-
 arch/arm/dts/rk3399-nanopi-r4s.dts            |   4 +-
 arch/arm/dts/rk3399-nanopi4-u-boot.dtsi       |   4 +
 arch/arm/dts/rk3399-nanopi4.dtsi              |   7 +-
 arch/arm/dts/rk3399-op1-opp.dtsi              |  31 +-
 arch/arm/dts/rk3399-opp.dtsi                  |   6 +-
 arch/arm/dts/rk3399-orangepi.dts              |  12 +-
 arch/arm/dts/rk3399-pinebook-pro.dts          |  24 +-
 arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi |  12 +
 arch/arm/dts/rk3399-pinephone-pro.dts         | 147 +++++++++
 arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi   |  16 +-
 arch/arm/dts/rk3399-puma-haikou.dts           |  42 ++-
 arch/arm/dts/rk3399-puma.dtsi                 |  17 +-
 arch/arm/dts/rk3399-roc-pc.dtsi               |  15 +-
 arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi  |  12 +
 arch/arm/dts/rk3399-rock-4c-plus.dts          |   1 +
 arch/arm/dts/rk3399-rock-4se-u-boot.dtsi      |  12 +
 arch/arm/dts/rk3399-rock-pi-4.dtsi            |   4 +-
 arch/arm/dts/rk3399-rock-pi-4c-u-boot.dtsi    |   7 +
 arch/arm/dts/rk3399-rock-pi-4c.dts            |  10 +
 arch/arm/dts/rk3399-rock960.dtsi              |   5 +-
 arch/arm/dts/rk3399-rockpro64.dtsi            |  98 +++++-
 arch/arm/dts/rk3399-u-boot.dtsi               |  54 ++--
 arch/arm/dts/rk3399.dtsi                      | 289 ++++++++++++++++--
 arch/arm/dts/rk3399pro-vmarc-som.dtsi         |  20 +-
 .../dts/rockchip-radxa-dalang-carrier.dtsi    |  21 ++
 configs/eaidk-610-rk3399_defconfig            |  11 +-
 configs/evb-rk3399_defconfig                  |   6 +-
 configs/ficus-rk3399_defconfig                |  22 +-
 configs/firefly-rk3399_defconfig              |   9 +-
 configs/khadas-edge-captain-rk3399_defconfig  |  29 +-
 configs/khadas-edge-rk3399_defconfig          |  27 +-
 configs/khadas-edge-v-rk3399_defconfig        |  29 +-
 configs/leez-rk3399_defconfig                 |  10 +-
 configs/nanopc-t4-rk3399_defconfig            |  10 +-
 configs/nanopi-m4-2gb-rk3399_defconfig        |  18 +-
 configs/nanopi-m4-rk3399_defconfig            |  18 +-
 configs/nanopi-m4b-rk3399_defconfig           |  18 +-
 configs/nanopi-neo4-rk3399_defconfig          |  11 +-
 configs/nanopi-r4s-rk3399_defconfig           |  11 +-
 configs/orangepi-rk3399_defconfig             |  10 +-
 configs/pinebook-pro-rk3399_defconfig         |   6 +-
 configs/pinephone-pro-rk3399_defconfig        |   8 +-
 configs/roc-pc-mezzanine-rk3399_defconfig     |   7 +-
 configs/roc-pc-rk3399_defconfig               |   7 +-
 configs/rock-4c-plus-rk3399_defconfig         |  24 +-
 configs/rock-4se-rk3399_defconfig             |  23 +-
 configs/rock-pi-4-rk3399_defconfig            |   8 +
 configs/rock-pi-4c-rk3399_defconfig           |  24 +-
 configs/rock-pi-n10-rk3399pro_defconfig       |   8 +-
 configs/rock960-rk3399_defconfig              |  10 +-
 configs/rockpro64-rk3399_defconfig            |   7 +-
 drivers/clk/rockchip/clk_rk3399.c             |  67 +++-
 include/dt-bindings/clock/rk3399-cru.h        |  30 +-
 72 files changed, 1462 insertions(+), 325 deletions(-)

-- 
2.43.2



More information about the U-Boot mailing list