From: Fabio Estevam <[email protected]> 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 <[email protected]> --- 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
