From 469912afd3518a046eb57d7d0141b5ebd2a082b0 Mon Sep 17 00:00:00 2001
From: Ian Goodacre <Ian.Goodacre@xtra.co.nz>
Date: Thu, 6 Mar 2025 06:19:57 +0000
Subject: [PATCH] Add support for NanoPi R2S Plus

---
 config/boards/nanopi-r2s-plus.csc             | 15 ++++++++++++
 .../dt/rk3328-nanopi-r2s-plus-rev00.dts       | 24 +++++++++++++++++++
 .../dt/rk3328-nanopi-r2s-plus-rev00.dts       | 24 +++++++++++++++++++
 .../001.add-trust-ini.patch                   | 21 ++++++++++++++++
 4 files changed, 84 insertions(+)
 create mode 100644 config/boards/nanopi-r2s-plus.csc
 create mode 100644 patch/kernel/archive/rockchip64-6.12/dt/rk3328-nanopi-r2s-plus-rev00.dts
 create mode 100644 patch/kernel/archive/rockchip64-6.14/dt/rk3328-nanopi-r2s-plus-rev00.dts
 create mode 100644 patch/u-boot/v2025.01/board_nanopi-r2s-plus/001.add-trust-ini.patch

diff --git a/config/boards/nanopi-r2s-plus.csc b/config/boards/nanopi-r2s-plus.csc
new file mode 100644
index 000000000000..9aee0cde9afa
--- /dev/null
+++ b/config/boards/nanopi-r2s-plus.csc
@@ -0,0 +1,15 @@
+# Rockchip RK3328 quad core 1GB 2 x GBE USB2
+BOARD_NAME="Nanopi R2S Plus"
+BOARDFAMILY="rockchip64"
+BOARD_MAINTAINER=""
+BOOTBRANCH="tag:v2025.01"
+BOOTPATCHDIR="v2025.01"
+BOOTCONFIG="nanopi-r2s-plus-rk3328_defconfig"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
+DEFAULT_CONSOLE="serial"
+MODULES="g_serial"
+MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu"
+SERIALCON="ttyS2:1500000,ttyGS0"
+HAS_VIDEO_OUTPUT="no"
+BOOT_FDT_FILE="rockchip/rk3328-nanopi-r2s-plus-rev00.dtb"
diff --git a/patch/kernel/archive/rockchip64-6.12/dt/rk3328-nanopi-r2s-plus-rev00.dts b/patch/kernel/archive/rockchip64-6.12/dt/rk3328-nanopi-r2s-plus-rev00.dts
new file mode 100644
index 000000000000..f6608017ad25
--- /dev/null
+++ b/patch/kernel/archive/rockchip64-6.12/dt/rk3328-nanopi-r2s-plus-rev00.dts
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2025 Ian Goodacre
+ */
+
+/dts-v1/;
+#include "rk3328-nanopi-r2s-plus.dts"
+
+/delete-node/ &rtl8211e;
+
+&gmac2io {
+	phy-handle = <&rtl8211f>;
+	snps,reset-delays-us = <0 15000 50000>;
+	tx_delay = <0x22>;
+	rx_delay = <0x12>;
+
+	mdio {
+		rtl8211f: ethernet-phy@1 {
+			compatible = "ethernet-phy-ieee802.3-c22";
+			reg = <0x1>;
+			realtek,ledsel = <0xae00>;
+		};
+	};
+};
diff --git a/patch/kernel/archive/rockchip64-6.14/dt/rk3328-nanopi-r2s-plus-rev00.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3328-nanopi-r2s-plus-rev00.dts
new file mode 100644
index 000000000000..f6608017ad25
--- /dev/null
+++ b/patch/kernel/archive/rockchip64-6.14/dt/rk3328-nanopi-r2s-plus-rev00.dts
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2025 Ian Goodacre
+ */
+
+/dts-v1/;
+#include "rk3328-nanopi-r2s-plus.dts"
+
+/delete-node/ &rtl8211e;
+
+&gmac2io {
+	phy-handle = <&rtl8211f>;
+	snps,reset-delays-us = <0 15000 50000>;
+	tx_delay = <0x22>;
+	rx_delay = <0x12>;
+
+	mdio {
+		rtl8211f: ethernet-phy@1 {
+			compatible = "ethernet-phy-ieee802.3-c22";
+			reg = <0x1>;
+			realtek,ledsel = <0xae00>;
+		};
+	};
+};
diff --git a/patch/u-boot/v2025.01/board_nanopi-r2s-plus/001.add-trust-ini.patch b/patch/u-boot/v2025.01/board_nanopi-r2s-plus/001.add-trust-ini.patch
new file mode 100644
index 000000000000..793f34dd12f4
--- /dev/null
+++ b/patch/u-boot/v2025.01/board_nanopi-r2s-plus/001.add-trust-ini.patch
@@ -0,0 +1,21 @@
+diff --git a/trust.ini b/trust.ini
+new file mode 100644
+index 0000000..4af021a
+--- /dev/null
++++ b/trust.ini
+@@ -0,0 +1,15 @@
++[VERSION]
++MAJOR=1
++MINOR=0
++[BL30_OPTION]
++SEC=0
++[BL31_OPTION]
++SEC=1
++PATH=bl31.elf
++ADDR=0x10000
++[BL32_OPTION]
++SEC=0
++[BL33_OPTION]
++SEC=0
++[OUTPUT]
++PATH=trust.bin