From: Fabio Estevam <festevam@gmail.com>
To: kever.yang@rock-chips.com
Cc: djw@t-chip.com.cn, u-boot@lists.denx.de,
Fabio Estevam <festevam@nabladev.com>
Subject: [PATCH v2 4/5] roc-pc-plus-rk3399: Introduce new variant
Date: Wed, 1 Jul 2026 14:57:59 -0300 [thread overview]
Message-ID: <20260701175800.40141-4-festevam@gmail.com> (raw)
In-Reply-To: <20260701175800.40141-1-festevam@gmail.com>
From: Fabio Estevam <festevam@nabladev.com>
The roc-pc-plus-rk3399 board shares a lot of features with the
existing supported roc-pc-rk3399 board.
Its devicetree is also supported in the upstream kernel.
The plus variant has only a 12V supply. It contains a XMC XM25QH128C
SPI NOR flash.
Add support for the plus variant.
Signed-off-by: Fabio Estevam <festevam@nabladev.com>
---
Changes since v1:
- None.
arch/arm/dts/rk3399-roc-pc-plus-u-boot.dtsi | 9 +++++++++
board/firefly/roc-pc-rk3399/MAINTAINERS | 1 +
configs/roc-pc-plus-rk3399_defconfig | 4 ++++
doc/board/rockchip/rockchip.rst | 3 ++-
4 files changed, 16 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/dts/rk3399-roc-pc-plus-u-boot.dtsi
create mode 100644 configs/roc-pc-plus-rk3399_defconfig
diff --git a/arch/arm/dts/rk3399-roc-pc-plus-u-boot.dtsi b/arch/arm/dts/rk3399-roc-pc-plus-u-boot.dtsi
new file mode 100644
index 000000000000..7d5af3e234da
--- /dev/null
+++ b/arch/arm/dts/rk3399-roc-pc-plus-u-boot.dtsi
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+#include "rk3399-roc-pc-u-boot.dtsi"
+
+/delete-node/ &vcc_hub_en;
+
+&dc_12v {
+ /delete-property/ vin-supply;
+};
diff --git a/board/firefly/roc-pc-rk3399/MAINTAINERS b/board/firefly/roc-pc-rk3399/MAINTAINERS
index 2c0de4432fa8..d32b078431ab 100644
--- a/board/firefly/roc-pc-rk3399/MAINTAINERS
+++ b/board/firefly/roc-pc-rk3399/MAINTAINERS
@@ -5,5 +5,6 @@ S: Maintained
F: board/firefly/roc-pc-rk3399
F: include/configs/roc-pc-rk3399.h
F: configs/roc-pc-rk3399_defconfig
+F: configs/roc-pc-plus-rk3399_defconfig
F: configs/roc-pc-mezzanine-rk3399_defconfig
F: arch/arm/dts/rk3399-roc-pc*
diff --git a/configs/roc-pc-plus-rk3399_defconfig b/configs/roc-pc-plus-rk3399_defconfig
new file mode 100644
index 000000000000..4ec2f7d44b5f
--- /dev/null
+++ b/configs/roc-pc-plus-rk3399_defconfig
@@ -0,0 +1,4 @@
+#include <configs/roc-pc-rk3399_common.config>
+CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3399-roc-pc-plus"
+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-roc-pc-plus.dtb"
+CONFIG_SPI_FLASH_XMC=y
diff --git a/doc/board/rockchip/rockchip.rst b/doc/board/rockchip/rockchip.rst
index ae18b08031d2..b87d857a312e 100644
--- a/doc/board/rockchip/rockchip.rst
+++ b/doc/board/rockchip/rockchip.rst
@@ -81,7 +81,8 @@ List of mainline supported Rockchip boards:
- 96boards RK3399 Ficus (ficus-rk3399)
- 96boards Rock960 (rock960-rk3399)
- Firefly-RK3399 (firefly_rk3399)
- - Firefly ROC-RK3399-PC
+ - Firefly ROC-RK3399-PC (roc-pc-rk3399)
+ - Firefly ROC-RK3399-PC Plus (roc-pc-plus-rk3399)
- FriendlyElec NanoPC-T4 (nanopc-t4-rk3399)
- FriendlyElec NanoPi M4 (nanopi-m4-rk3399)
- FriendlyElec NanoPi M4B (nanopi-m4b-rk3399)
--
2.43.0
next prev parent reply other threads:[~2026-07-01 17:58 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-01 17:57 [PATCH v2 1/5] roc-pc-rk3399: Enable redundant SPI flash environment Fabio Estevam
2026-07-01 17:57 ` [PATCH v2 2/5] roc-pc-rk3399: Introduce a common defconfig Fabio Estevam
2026-07-01 17:57 ` [PATCH v2 3/5] mtd: spi-nor-ids: Add XMC XM25QH128C Fabio Estevam
2026-07-01 17:57 ` Fabio Estevam [this message]
2026-07-01 17:58 ` [PATCH v2 5/5] roc-pc-plus-rk3399: Enable USB Mass Storage support Fabio Estevam
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260701175800.40141-4-festevam@gmail.com \
--to=festevam@gmail.com \
--cc=djw@t-chip.com.cn \
--cc=festevam@nabladev.com \
--cc=kever.yang@rock-chips.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox