Skip to contentSkip to conversation

Please pull u-boot-rockchip-2026.10-20260724 into main

GIT PULL Quentin Schulz via U-Boot 2 participants 2 messages Jul 24 – Jul 27

lore
Share & tools
lore
#0 lore raw

Hi Tom,

The following changes since commit fdfe2ec48d5c1c2ed03073d73edd3fdd3fe1ffa1:

clk: airoha: fix off-by-one in clock ID boundary check (2026-07-17
14:50:35 -0600)

are available in the Git repository at:

https://git.u-boot-project.org/u-boot/custodians/u-boot-rockchip.git
tags/u-boot-rockchip-2026.10-20260724

for you to fetch changes up to d97d3df79e7bd7021dac0a1974c314c5acb07ac3:

mtd: nand: raw: rockchip_nfc: fix ecc setup (2026-07-23 17:43:33 +0200)

----------------------------------------------------------------
- Switched to use upstream pinctrl header include,
- Dropped SDHCI DT properties in U-Boot-specific DT for NanoPi R5 as most are present upstream and those which aren't are breaking devices,
- Fixed ECC strength mismatch between reading and writing on non-0 NAND chips configured as boot medium (nand-is-boot-medium),
- Moved Simon to reviewer for ARM ROCKCHIP,
- Fixed build issue related to GPT capsule support accessing a struct member only present when CONFIG_PARTITION_TYPE_GUID is set,
- Added support for new devices:
- Anbernic RG-DS
- ROC-RK3588S-PC

----------------------------------------------------------------

CI: https://git.u-boot-project.org/u-boot/custodians/u-boot-rockchip/-/pipelines/722

Chris Morgan (1):
board: rockchip: add Anbernic RG-DS

Daniel Golle (1):
rockchip: only build GPT capsule update helpers with
PARTITION_TYPE_GUID

Fabio Estevam (1):
rockchip: rk3588s: Add support for ROC-RK3588S-PC

Johan Jonker (4):
rockchip: pinctrl: replace RK_FUNC_n defines
rockchip: pinctrl: replace RK_GPIOn defines
rockchip: pinctrl: use include from dts/upstream
mtd: nand: raw: rockchip_nfc: fix ecc setup

Peter Robinson (1):
rockchip: rk3568-nanopi-r5: Drop duplicated/extra sdhci

Quentin Schulz (1):
MAINTAINERS: update ARM ROCKCHIP entry to list Simon as reviewer

 MAINTAINERS                                    |   2 +-
 arch/arm/dts/rk3368-sheep.dts                  |   2 +-
 arch/arm/dts/rk3568-anbernic-rg-ds-u-boot.dtsi |  41 
+++++++++++++++++++++++++++++++++++++++++
 arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi     |   8 --------
 arch/arm/mach-rockchip/board.c                 |   6 ++++--
 arch/arm/mach-rockchip/rk3568/Kconfig          |   7 +++++++
 arch/arm/mach-rockchip/rk3588/Kconfig          |   7 +++++++
 board/anbernic/rg-ds_rk3568/Kconfig            |  12 ++++++++++++
 board/anbernic/rg-ds_rk3568/MAINTAINERS        |   7 +++++++
 board/firefly/roc-pc-rk3588s/Kconfig           |  12 ++++++++++++
 board/firefly/roc-pc-rk3588s/MAINTAINERS       |   6 ++++++
 configs/anbernic-rg-ds-rk3568_defconfig        |  73 
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configs/roc-pc-rk3588s_defconfig               |  81 
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 doc/board/rockchip/rockchip.rst                |   2 ++
 doc/develop/driver-model/serial-howto.rst      |   4 ++--
 drivers/mtd/nand/raw/rockchip_nfc.c            |  14 ++++++++------
 drivers/pinctrl/rockchip/pinctrl-rk3568.c      | 186 
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------
 drivers/pinctrl/rockchip/pinctrl-rv1126.c      | 134 
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------
 include/configs/anbernic-rg-ds-rk3568.h        |  12 ++++++++++++
 include/configs/roc-pc-rk3588s.h               |   8 ++++++++
 include/dt-bindings/pinctrl/rockchip.h         |  60 
------------------------------------------------------------
 21 files changed, 444 insertions(+), 240 deletions(-)
 create mode 100644 arch/arm/dts/rk3568-anbernic-rg-ds-u-boot.dtsi
 create mode 100644 board/anbernic/rg-ds_rk3568/Kconfig
 create mode 100644 board/anbernic/rg-ds_rk3568/MAINTAINERS
 create mode 100644 board/firefly/roc-pc-rk3588s/Kconfig
 create mode 100644 board/firefly/roc-pc-rk3588s/MAINTAINERS
 create mode 100644 configs/anbernic-rg-ds-rk3568_defconfig
 create mode 100644 configs/roc-pc-rk3588s_defconfig
 create mode 100644 include/configs/anbernic-rg-ds-rk3568.h
 create mode 100644 include/configs/roc-pc-rk3588s.h
 delete mode 100644 include/dt-bindings/pinctrl/rockchip.h
#1 lore raw
Quoted 11 lines · Quentin Schulz

The following changes since commit fdfe2ec48d5c1c2ed03073d73edd3fdd3fe1ffa1:

clk: airoha: fix off-by-one in clock ID boundary check (2026-07-17
14:50:35 -0600)

are available in the Git repository at:

https://git.u-boot-project.org/u-boot/custodians/u-boot-rockchip.git
tags/u-boot-rockchip-2026.10-20260724

[...]

Merged into u-boot/main, thanks!

Signature · 1 line
Tom