rockchip: rock5b-rk3588: Add support for ROCK 5B+

Include FDTs for both ROCK 5B and 5B+ in the FIT and add board selection
code to load the 5B+ FDT when the DRAM type is LPDDR5 and ADC channel 5
value is close to 4095.

  U-Boot 2025.07 (Jul 14 2025 - 21:28:20 +0000)

  Model: Radxa ROCK 5B+
  SoC:   RK3588
  DRAM:  8 GiB

Features tested on a ROCK 5B+ v1.2:
- SD-card boot
- eMMC boot
- SPI flash boot
- PCIe/NVMe
- Ethernet
- USB/TCPM

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

diff --git a/arch/arm/dts/rk3588-rock-5b-plus-u-boot.dtsi b/arch/arm/dts/rk3588-rock-5b-plus-u-boot.dtsi
new file mode 100644 (file)
index 0000000..c07696c
--- /dev/null
+++ b/arch/arm/dts/rk3588-rock-5b-plus-u-boot.dtsi
@@ -0,0 +1,3 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+
+#include "rk3588-rock-5b-u-boot.dtsi"

diff --git a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
index d51fbf51cb88ba7cb49e8e07bcfdc04cfbc134c7..e07b549c767f3ad45aab3f1ebcf8eb20160911f3 100644 (file)
--- a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
+++ b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
@@ -46,6 +46,11 @@
        };
 };
 
+&saradc {
+       bootph-pre-ram;
+       vdd-microvolts = <1800000>;
+};
+
 &sdhci {
        cap-mmc-highspeed;
        mmc-hs200-1_8v;

diff --git a/board/radxa/rock5b-rk3588/Kconfig b/board/radxa/rock5b-rk3588/Kconfig
index 41dfe2402b124cd4d1d374ddd3af7b30b8ac4689..98d63011783606f2e3b43c001adb509d89beb62e 100644 (file)
--- a/board/radxa/rock5b-rk3588/Kconfig
+++ b/board/radxa/rock5b-rk3588/Kconfig
@@ -9,4 +9,9 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "rock5b-rk3588"
 
+config BOARD_SPECIFIC_OPTIONS # dummy
+       def_bool y
+       select ADC
+       select SPL_ADC
+
 endif

diff --git a/board/radxa/rock5b-rk3588/MAINTAINERS b/board/radxa/rock5b-rk3588/MAINTAINERS
index 4460c9971a9670dd5c00e2b47a7fe32018ea90e3..c8a43769105e473b5bd47f1ff5d0b98f80b41c9b 100644 (file)
--- a/board/radxa/rock5b-rk3588/MAINTAINERS
+++ b/board/radxa/rock5b-rk3588/MAINTAINERS
@@ -5,5 +5,4 @@ S:      Maintained
 F:     board/radxa/rock5b-rk3588
 F:     include/configs/rock5b-rk3588.h
 F:     configs/rock5b-rk3588_defconfig
-F:     arch/arm/dts/rk3588-rock-5b.dts
-F:     arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
+F:     arch/arm/dts/rk3588-rock-5b*

diff --git a/board/radxa/rock5b-rk3588/rock5b-rk3588.c b/board/radxa/rock5b-rk3588/rock5b-rk3588.c
index fc2f69db22416b6656d7f950bb8c7428e891aaae..6bf4497ce3aed0f48a538ad51d487e7c52c1ef09 100644 (file)
--- a/board/radxa/rock5b-rk3588/rock5b-rk3588.c
+++ b/board/radxa/rock5b-rk3588/rock5b-rk3588.c
@@ -3,8 +3,71 @@
  * Copyright (c) 2023-2024 Collabora Ltd.
  */
 
+#include <adc.h>
+#include <env.h>
 #include <fdtdec.h>
 #include <fdt_support.h>
+#include <asm/arch-rockchip/sdram.h>
+#include <linux/errno.h>
+
+#define PMU1GRF_BASE           0xfd58a000
+#define OS_REG2_REG            0x208
+
+#define HW_ID_CHANNEL          5
+
+struct board_model {
+       unsigned int dram;
+       unsigned int low;
+       unsigned int high;
+       const char *fdtfile;
+};
+
+static const struct board_model board_models[] = {
+       { LPDDR5, 4005, 4185, "rockchip/rk3588-rock-5b-plus.dtb" },
+};
+
+static const struct board_model *get_board_model(void)
+{
+       unsigned int val, dram_type;
+       int i, ret;
+
+       dram_type = rockchip_sdram_type(PMU1GRF_BASE + OS_REG2_REG);
+
+       ret = adc_channel_single_shot("adc@fec10000", HW_ID_CHANNEL, &val);
+       if (ret)
+               return NULL;
+
+       for (i = 0; i < ARRAY_SIZE(board_models); i++) {
+               unsigned int dram = board_models[i].dram;
+               unsigned int min = board_models[i].low;
+               unsigned int max = board_models[i].high;
+
+               if (dram == dram_type && min <= val && val <= max)
+                       return &board_models[i];
+       }
+
+       return NULL;
+}
+
+int rk_board_late_init(void)
+{
+       const struct board_model *model = get_board_model();
+
+       if (model)
+               env_set("fdtfile", model->fdtfile);
+
+       return 0;
+}
+
+int board_fit_config_name_match(const char *name)
+{
+       const struct board_model *model = get_board_model();
+
+       if (model && !strcmp(name, model->fdtfile))
+               return 0;
+
+       return -EINVAL;
+}
 
 #ifdef CONFIG_OF_BOARD_SETUP
 int ft_board_setup(void *blob, struct bd_info *bd)

diff --git a/configs/rock5b-rk3588_defconfig b/configs/rock5b-rk3588_defconfig
index 6349e8791456f4bc952d1b6636e37864c545d7ff..967cebc2054f6b68efa6c7f26f5f3e83d5d9c72d 100644 (file)
--- a/configs/rock5b-rk3588_defconfig
+++ b/configs/rock5b-rk3588_defconfig
@@ -47,6 +47,7 @@ CONFIG_CMD_REGULATOR=y
 # CONFIG_SPL_DOS_PARTITION is not set
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_LIVE=y
+CONFIG_OF_LIST="rockchip/rk3588-rock-5b rockchip/rk3588-rock-5b-plus"
 CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPL_REGMAP=y

diff --git a/doc/board/rockchip/rockchip.rst b/doc/board/rockchip/rockchip.rst
index 0acccb51ad5c1203a6e8c224da934b968d2a5b98..9af701feb5d9fc34a11a9bb5f873d1608d042b36 100644 (file)
--- a/doc/board/rockchip/rockchip.rst
+++ b/doc/board/rockchip/rockchip.rst
@@ -162,7 +162,7 @@ List of mainline supported Rockchip boards:
      - Pine64 QuartzPro64 (quartzpro64-rk3588)
      - Radxa ROCK 5 ITX (rock-5-itx-rk3588)
      - Radxa ROCK 5A (rock5a-rk3588s)
-     - Radxa ROCK 5B (rock5b-rk3588)
+     - Radxa ROCK 5B/5B+ (rock5b-rk3588)
      - Radxa ROCK 5C (rock-5c-rk3588s)
      - Rockchip Toybrick TB-RK3588X (toybrick-rk3588)
      - Theobroma Systems RK3588-SBC Jaguar (jaguar-rk3588)