Merge tag 'u-boot-rockchip-2026.10-20260710' of https://git.u-boot-project.org/u-boot/custodians/u-boot-rockchip

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

- Add new rockchip custodian,
- Remove inactive rockchip custodian,
- Preemptively fix rk3528/rk356x DTS issue that will come with 7.1
  upstream DTS sync,
- Fix typo in doc,
- Fix variable used before being set in rockchip_nfc,
- Fix asm-operand-widths clang warning for RK3528, RK3576 and RK3588,
- Work around HW undefined state for NVMEs on RK3588 Jaguar,
- Added support for new devices:
  - LinkEase EasePi R1
  - 9Tripod X3568 v4

2 files changed, 30 insertions, 0 deletions

diff --git a/board/rockchip/evb_rk3568/MAINTAINERS b/board/rockchip/evb_rk3568/MAINTAINERS
index 7e17a6a987a..3e2d864901f 100644
--- a/board/rockchip/evb_rk3568/MAINTAINERS
+++ b/board/rockchip/evb_rk3568/MAINTAINERS
@@ -1,9 +1,19 @@
+9TRIPOD-X3568-V4
+M:	Coia Prant <[email protected]>
+S:	Maintained
+F:	configs/9tripod-x3568-v4-rk3568_defconfig
+
 BANANAPI-BPI-R2-PRO
 M:	Frank Wunderlich <[email protected]>
 S:	Maintained
 F:	configs/bpi-r2-pro-rk3568_defconfig
 F:	arch/arm/dts/rk3568-bpi-r2-pro*
 
+EASEPI-R1
+M:	Liangbin Lian <[email protected]>
+S:	Maintained
+F:	configs/easepi-r1-rk3568_defconfig
+
 EVB-RK3568
 M:	Joseph Chen <[email protected]>
 S:	Maintained
diff --git a/board/theobroma-systems/jaguar_rk3588/jaguar_rk3588.c b/board/theobroma-systems/jaguar_rk3588/jaguar_rk3588.c
index 3f484646701..5177aa9d6e8 100644
--- a/board/theobroma-systems/jaguar_rk3588/jaguar_rk3588.c
+++ b/board/theobroma-systems/jaguar_rk3588/jaguar_rk3588.c
@@ -54,6 +54,8 @@ int rockchip_early_misc_init_r(void)
 
 #define GPIO0B7_PU_EN BIT(15)
 
+#define M2_NVME_PERSTN	24 /* GPIO0_D0, PERSTN signal to the M.2 NVMe slot */
+
 void spl_board_init(void)
 {
 	/*
@@ -67,6 +69,24 @@ void spl_board_init(void)
 	 * pull-up.
 	 */
 	struct rk3588_pmu2_ioc * const ioc = (void *)PMU2_IOC_BASE;
+	int ret;
 
+	/* TODO: once we have a U-Boot TPL, move this to tpl_board_init() */
 	rk_setreg(&ioc->gpio0b_p, GPIO0B7_PU_EN);
+
+	/*
+	 * Set the M.2 NVMe slot PERSTN to a defined low
+	 * state as early as possible
+	 */
+	ret = gpio_request(M2_NVME_PERSTN, "M2_NVME_PERSTN");
+	if (ret) {
+		log_err("M2_NVME_PERSTN: gpio request failed: %d\n", ret);
+		return;
+	}
+
+	ret = gpio_direction_output(M2_NVME_PERSTN, 0);
+	if (ret) {
+		log_err("M2_NVME_PERSTN: gpio direction set failed: %d\n", ret);
+		return;
+	}
 }