Pull request: u-boot-rockchip/for-next

Kever Yang kever.yang at rock-chips.com
Mon Dec 26 13:36:02 CET 2022


Hi Tom,

Please pull the updates for rockchip platform for next:
- Add support for rv1126 soc and rv1126 neu2 io board;
- Add support for rk3399 pine64 pinephone pro board;
- dts sync from linux for rk3399 and px30;

Travis:
https://source.denx.de/u-boot/custodians/u-boot-rockchip/-/jobs/546342

Thanks,
- Kever

The following changes since commit 3e4cbe184a0f6537abb457d6afa61224396c4e46:

  Merge branch '2022-12-23-complete-phase1-CONFIG-migration' into next (2022-12-23 22:19:39 -0500)

are available in the Git repository at:

  https://source.denx.de/u-boot/custodians/u-boot-rockchip.git for-next

for you to fetch changes up to 9636b196c7046f1efa16fcfe7e1df9dcbb0f77fc:

  board: rockchip: Add Edgeble Neu2 IO Board (2022-12-26 13:53:26 +0800)

----------------------------------------------------------------
Christopher Obbard (1):
      configs: roc-pc-rk3399: Enable rockchip efuse support

Jagan Teki (25):
      ram: Mark ram-uclass depend on TPL_DM or SPL_DM
      ram: rockchip: Add common ddr type configs
      ram: rockchip: Compute ddr capacity based on grf split
      ram: rockchip: Update ddr pctl regs for px30
      ram: rockchip: Add rv1126 ddr3 support
      ram: rockchip: Add rv1126 ddr loader params
      ram: rockchip: Add rv1126 ddr driver support
      ram: rockchip: rv1126: Control ddr init prints via DEBUG
      ram: rockchip: Add rv1126 lpddr4 support
      pinctrl: rockchip: Add pinctrl route types
      pinctrl: rockchip: Add rv1126 support
      arch: rockchip: Add cru header for rv1126
      dt-bindings: clk: Add dt-binding header for RV1126
      clk: rockchip: Add rv1126 clk support
      dt-bindings: power: Add power-domain header for rv1126
      arm: rockchip: Add grf header for rv1126
      ARM: dts: rockchip: Add Rockchip RV1126 pinctrl
      ARM: dts: rockchip: Add Rockchip RV1126 SoC
      arm: rockchip: Add RV1126 arch core support
      arm: rockchip: rv1126: Set dram area unsecure for SPL
      rockchip: mkimage: Add rv1126 support
      ARM: dts: rockchip: rv1126: Add Edgeble Neural Compute Module 2(Neu2)
      ARM: dts: rockchip: rv1126: Add Edgeble Neural Compute Module 2(Neu2) IO
      ARM: dts: rockchip: Add rv1126-u-boot.dtsi
      board: rockchip: Add Edgeble Neu2 IO Board

John Keeping (2):
      rc4: mark key as const
      rockchip: mkimage: make RC4 key const

Peter Robinson (3):
      arm64: dts: rk3399: sync rk3399.dtsi from 6.1-rc1
      arm64: dts: rk3399: Add upstream Pinephone Pro dts
      rockchip: Add initial support for the PINE64 Pinephone Pro

Quentin Schulz (7):
      rockchip: px30: make watchdog and tsadc trigger a first global reset
      rockchip: clk: add watchdog clock to px30_clk_enable
      rockchip: puma-rk3399: sync DTS with Linux kernel next-20221114
      rockchip: px30: fix CFG_IRAM_BASE
      rockchip: px30: list possible SPL boot devices
      rockchip: px30: insert u-boot, spl-boot-device into U-Boot device tree
      arm64: dts: rockchip: sync px30 DTSI with Linux kernel next-20221114

 arch/arm/dts/Makefile                              |    4 +
 arch/arm/dts/px30.dtsi                             |   28 +-
 arch/arm/dts/rk3399-opp.dtsi                       |    6 +-
 arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi      |   39 +
 arch/arm/dts/rk3399-pinephone-pro.dts              |  398 +++
 arch/arm/dts/rk3399-puma-haikou.dts                |    5 +-
 arch/arm/dts/rk3399-puma.dtsi                      |   32 +-
 arch/arm/dts/rk3399-u-boot.dtsi                    |   36 +-
 arch/arm/dts/rk3399.dtsi                           |  200 +-
 arch/arm/dts/rv1126-edgeble-neu2-io-u-boot.dtsi    |   10 +
 arch/arm/dts/rv1126-edgeble-neu2-io.dts            |   42 +
 arch/arm/dts/rv1126-edgeble-neu2.dtsi              |  338 ++
 arch/arm/dts/rv1126-pinctrl.dtsi                   |  211 ++
 arch/arm/dts/rv1126-u-boot.dtsi                    |   62 +
 arch/arm/dts/rv1126.dtsi                           |  438 +++
 arch/arm/include/asm/arch-rockchip/cru_rv1126.h    |  459 +++
 .../include/asm/arch-rockchip/dram_spec_timing.h   |  452 +++
 arch/arm/include/asm/arch-rockchip/grf_rv1126.h    |  251 ++
 arch/arm/include/asm/arch-rockchip/sdram_common.h  |  214 +-
 arch/arm/include/asm/arch-rockchip/sdram_msch.h    |   12 +
 .../include/asm/arch-rockchip/sdram_pctl_px30.h    |  100 +-
 .../include/asm/arch-rockchip/sdram_phy_rv1126.h   |   93 +
 arch/arm/include/asm/arch-rockchip/sdram_rv1126.h  |  420 +++
 arch/arm/include/asm/arch-rv1126/boot0.h           |   11 +
 arch/arm/include/asm/arch-rv1126/gpio.h            |   11 +
 arch/arm/mach-rockchip/Kconfig                     |   46 +
 arch/arm/mach-rockchip/Makefile                    |    1 +
 arch/arm/mach-rockchip/px30/px30.c                 |   61 +
 arch/arm/mach-rockchip/rk3399/Kconfig              |    8 +
 arch/arm/mach-rockchip/rv1126/Kconfig              |   59 +
 arch/arm/mach-rockchip/rv1126/Makefile             |   13 +
 arch/arm/mach-rockchip/rv1126/clk_rv1126.c         |   33 +
 arch/arm/mach-rockchip/rv1126/rv1126.c             |   75 +
 arch/arm/mach-rockchip/rv1126/syscon_rv1126.c      |   47 +
 board/edgeble/neural-compute-module-2/Kconfig      |   16 +
 board/edgeble/neural-compute-module-2/MAINTAINERS  |    6 +
 board/edgeble/neural-compute-module-2/Makefile     |    7 +
 board/edgeble/neural-compute-module-2/neu2.c       |    4 +
 board/engicam/px30_core/Kconfig                    |    2 +-
 board/pine64/pinephone-pro-rk3399/Kconfig          |   15 +
 board/pine64/pinephone-pro-rk3399/MAINTAINERS      |    8 +
 board/pine64/pinephone-pro-rk3399/Makefile         |    1 +
 .../pinephone-pro-rk3399/pinephone-pro-rk3399.c    |   76 +
 common/spl/Kconfig.tpl                             |    2 +-
 configs/khadas-edge-captain-rk3399_defconfig       |    2 +-
 configs/khadas-edge-rk3399_defconfig               |    2 +-
 configs/khadas-edge-v-rk3399_defconfig             |    2 +-
 configs/leez-rk3399_defconfig                      |    2 +-
 configs/nanopi-r4s-rk3399_defconfig                |    2 +-
 configs/neu2-io-rv1126_defconfig                   |   57 +
 configs/pinebook-pro-rk3399_defconfig              |    2 +-
 configs/pinephone-pro-rk3399_defconfig             |  104 +
 configs/roc-pc-mezzanine-rk3399_defconfig          |    4 +-
 configs/roc-pc-rk3399_defconfig                    |    4 +-
 configs/rock-pi-4-rk3399_defconfig                 |    2 +-
 configs/rock-pi-4c-rk3399_defconfig                |    2 +-
 configs/rockpro64-rk3399_defconfig                 |    2 +-
 doc/board/rockchip/rockchip.rst                    |    3 +
 drivers/clk/rockchip/Makefile                      |    1 +
 drivers/clk/rockchip/clk_px30.c                    |    3 +
 drivers/clk/rockchip/clk_rk3399.c                  |    2 +-
 drivers/clk/rockchip/clk_rv1126.c                  | 1889 +++++++++++
 drivers/pinctrl/rockchip/Makefile                  |    1 +
 drivers/pinctrl/rockchip/pinctrl-px30.c            |   11 +-
 drivers/pinctrl/rockchip/pinctrl-rk3128.c          |   11 +-
 drivers/pinctrl/rockchip/pinctrl-rk322x.c          |   11 +-
 drivers/pinctrl/rockchip/pinctrl-rk3288.c          |   11 +-
 drivers/pinctrl/rockchip/pinctrl-rk3308.c          |   11 +-
 drivers/pinctrl/rockchip/pinctrl-rk3328.c          |   11 +-
 drivers/pinctrl/rockchip/pinctrl-rk3399.c          |   11 +-
 drivers/pinctrl/rockchip/pinctrl-rockchip-core.c   |   45 +-
 drivers/pinctrl/rockchip/pinctrl-rockchip.h        |   58 +-
 drivers/pinctrl/rockchip/pinctrl-rv1126.c          |  416 +++
 drivers/ram/Makefile                               |    2 +-
 drivers/ram/rockchip/Kconfig                       |   32 +-
 drivers/ram/rockchip/Makefile                      |    1 +
 .../ram/rockchip/sdram-rv1126-ddr3-detect-1056.inc |   72 +
 .../ram/rockchip/sdram-rv1126-ddr3-detect-328.inc  |   72 +
 .../ram/rockchip/sdram-rv1126-ddr3-detect-396.inc  |   72 +
 .../ram/rockchip/sdram-rv1126-ddr3-detect-528.inc  |   72 +
 .../ram/rockchip/sdram-rv1126-ddr3-detect-664.inc  |   72 +
 .../ram/rockchip/sdram-rv1126-ddr3-detect-784.inc  |   72 +
 .../ram/rockchip/sdram-rv1126-ddr3-detect-924.inc  |   72 +
 .../ram/rockchip/sdram-rv1126-loader_params.inc    |  197 ++
 .../rockchip/sdram-rv1126-lpddr4-detect-1056.inc   |   78 +
 .../rockchip/sdram-rv1126-lpddr4-detect-328.inc    |   78 +
 .../rockchip/sdram-rv1126-lpddr4-detect-396.inc    |   78 +
 .../rockchip/sdram-rv1126-lpddr4-detect-528.inc    |   78 +
 .../rockchip/sdram-rv1126-lpddr4-detect-664.inc    |   78 +
 .../rockchip/sdram-rv1126-lpddr4-detect-784.inc    |   78 +
 .../rockchip/sdram-rv1126-lpddr4-detect-924.inc    |   78 +
 drivers/ram/rockchip/sdram_common.c                |    6 +-
 drivers/ram/rockchip/sdram_pctl_px30.c             |    6 +-
 drivers/ram/rockchip/sdram_px30.c                  |    8 +-
 drivers/ram/rockchip/sdram_rk3328.c                |    2 +-
 drivers/ram/rockchip/sdram_rk3399.c                |    9 +-
 drivers/ram/rockchip/sdram_rv1126.c                | 3543 ++++++++++++++++++++
 include/configs/neural-compute-module-2.h          |   21 +
 include/configs/pinephone-pro-rk3399.h             |   19 +
 include/configs/px30_common.h                      |    3 +-
 include/configs/rv1126_common.h                    |   40 +
 include/dt-bindings/clock/rk3399-cru.h             |   24 +-
 include/dt-bindings/clock/rockchip,rv1126-cru.h    |  632 ++++
 include/dt-bindings/power/rk3399-power.h           |    1 +
 include/dt-bindings/power/rockchip,rv1126-power.h  |   35 +
 include/rc4.h                                      |    2 +-
 lib/rc4.c                                          |    2 +-
 tools/rkcommon.c                                   |    3 +-
 108 files changed, 12471 insertions(+), 201 deletions(-)
 create mode 100644 arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3399-pinephone-pro.dts
 create mode 100644 arch/arm/dts/rv1126-edgeble-neu2-io-u-boot.dtsi
 create mode 100644 arch/arm/dts/rv1126-edgeble-neu2-io.dts
 create mode 100644 arch/arm/dts/rv1126-edgeble-neu2.dtsi
 create mode 100644 arch/arm/dts/rv1126-pinctrl.dtsi
 create mode 100644 arch/arm/dts/rv1126-u-boot.dtsi
 create mode 100644 arch/arm/dts/rv1126.dtsi
 create mode 100644 arch/arm/include/asm/arch-rockchip/cru_rv1126.h
 create mode 100644 arch/arm/include/asm/arch-rockchip/dram_spec_timing.h
 create mode 100644 arch/arm/include/asm/arch-rockchip/grf_rv1126.h
 create mode 100644 arch/arm/include/asm/arch-rockchip/sdram_phy_rv1126.h
 create mode 100644 arch/arm/include/asm/arch-rockchip/sdram_rv1126.h
 create mode 100644 arch/arm/include/asm/arch-rv1126/boot0.h
 create mode 100644 arch/arm/include/asm/arch-rv1126/gpio.h
 create mode 100644 arch/arm/mach-rockchip/rv1126/Kconfig
 create mode 100644 arch/arm/mach-rockchip/rv1126/Makefile
 create mode 100644 arch/arm/mach-rockchip/rv1126/clk_rv1126.c
 create mode 100644 arch/arm/mach-rockchip/rv1126/rv1126.c
 create mode 100644 arch/arm/mach-rockchip/rv1126/syscon_rv1126.c
 create mode 100644 board/edgeble/neural-compute-module-2/Kconfig
 create mode 100644 board/edgeble/neural-compute-module-2/MAINTAINERS
 create mode 100644 board/edgeble/neural-compute-module-2/Makefile
 create mode 100644 board/edgeble/neural-compute-module-2/neu2.c
 create mode 100644 board/pine64/pinephone-pro-rk3399/Kconfig
 create mode 100644 board/pine64/pinephone-pro-rk3399/MAINTAINERS
 create mode 100644 board/pine64/pinephone-pro-rk3399/Makefile
 create mode 100644 board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c
 create mode 100644 configs/neu2-io-rv1126_defconfig
 create mode 100644 configs/pinephone-pro-rk3399_defconfig
 create mode 100644 drivers/clk/rockchip/clk_rv1126.c
 create mode 100644 drivers/pinctrl/rockchip/pinctrl-rv1126.c
 create mode 100644 drivers/ram/rockchip/sdram-rv1126-ddr3-detect-1056.inc
 create mode 100644 drivers/ram/rockchip/sdram-rv1126-ddr3-detect-328.inc
 create mode 100644 drivers/ram/rockchip/sdram-rv1126-ddr3-detect-396.inc
 create mode 100644 drivers/ram/rockchip/sdram-rv1126-ddr3-detect-528.inc
 create mode 100644 drivers/ram/rockchip/sdram-rv1126-ddr3-detect-664.inc
 create mode 100644 drivers/ram/rockchip/sdram-rv1126-ddr3-detect-784.inc
 create mode 100644 drivers/ram/rockchip/sdram-rv1126-ddr3-detect-924.inc
 create mode 100644 drivers/ram/rockchip/sdram-rv1126-loader_params.inc
 create mode 100644 drivers/ram/rockchip/sdram-rv1126-lpddr4-detect-1056.inc
 create mode 100644 drivers/ram/rockchip/sdram-rv1126-lpddr4-detect-328.inc
 create mode 100644 drivers/ram/rockchip/sdram-rv1126-lpddr4-detect-396.inc
 create mode 100644 drivers/ram/rockchip/sdram-rv1126-lpddr4-detect-528.inc
 create mode 100644 drivers/ram/rockchip/sdram-rv1126-lpddr4-detect-664.inc
 create mode 100644 drivers/ram/rockchip/sdram-rv1126-lpddr4-detect-784.inc
 create mode 100644 drivers/ram/rockchip/sdram-rv1126-lpddr4-detect-924.inc
 create mode 100644 drivers/ram/rockchip/sdram_rv1126.c
 create mode 100644 include/configs/neural-compute-module-2.h
 create mode 100644 include/configs/pinephone-pro-rk3399.h
 create mode 100644 include/configs/rv1126_common.h
 create mode 100644 include/dt-bindings/clock/rockchip,rv1126-cru.h
 create mode 100644 include/dt-bindings/power/rockchip,rv1126-power.h


More information about the U-Boot mailing list