diff --git a/patch/kernel/rockchip64-current/add-board-nanopi-m4v2.patch b/patch/kernel/rockchip64-current/add-board-nanopi-m4v2.patch
new file mode 100644
index 0000000000..ba844c8b80
--- /dev/null
+++ b/patch/kernel/rockchip64-current/add-board-nanopi-m4v2.patch
@@ -0,0 +1,84 @@
+diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
+index 948195b49..48dccb95e 100644
+--- a/arch/arm64/boot/dts/rockchip/Makefile
++++ b/arch/arm64/boot/dts/rockchip/Makefile
+@@ -22,6 +22,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-captain.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-v.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopc-t4.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4.dtb
++dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4v2.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-neo4.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-orangepi.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pinebook-pro.dtb
+diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4v2.dts b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4v2.dts
+new file mode 100644
+index 000000000..60358ab8c
+--- /dev/null
++++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4v2.dts
+@@ -0,0 +1,66 @@
++// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
++/*
++ * FriendlyElec NanoPi M4V2 board device tree source
++ *
++ * Copyright (c) 2018 FriendlyElec Computer Tech. Co., Ltd.
++ * (http://www.friendlyarm.com)
++ *
++ * Copyright (c) 2018 Collabora Ltd.
++ * Copyright (c) 2019 Arm Ltd.
++ */
++
++/dts-v1/;
++#include "rk3399-nanopi4.dtsi"
++
++/ {
++	model = "FriendlyElec NanoPi M4 Ver2.0";
++	compatible = "friendlyarm,nanopi-m4", "rockchip,rk3399";
++
++	vdd_5v: vdd-5v {
++		compatible = "regulator-fixed";
++		regulator-name = "vdd_5v";
++		regulator-always-on;
++		regulator-boot-on;
++	};
++
++	vcc5v0_core: vcc5v0-core {
++		compatible = "regulator-fixed";
++		regulator-name = "vcc5v0_core";
++		regulator-always-on;
++		regulator-boot-on;
++		vin-supply = <&vdd_5v>;
++	};
++
++	vcc5v0_usb1: vcc5v0-usb1 {
++		compatible = "regulator-fixed";
++		regulator-name = "vcc5v0_usb1";
++		regulator-always-on;
++		regulator-boot-on;
++		vin-supply = <&vcc5v0_sys>;
++	};
++
++	vcc5v0_usb2: vcc5v0-usb2 {
++		compatible = "regulator-fixed";
++		regulator-name = "vcc5v0_usb2";
++		regulator-always-on;
++		regulator-boot-on;
++		vin-supply = <&vcc5v0_sys>;
++	};
++};
++
++&vcc3v3_sys {
++	vin-supply = <&vcc5v0_core>;
++};
++
++&u2phy0_host {
++	phy-supply = <&vcc5v0_usb1>;
++};
++
++&u2phy1_host {
++	phy-supply = <&vcc5v0_usb2>;
++};
++
++&vbus_typec {
++	regulator-always-on;
++	vin-supply = <&vdd_5v>;
++};
diff --git a/patch/kernel/rockchip64-current/board-nanopi-m4v2-dts-ethernet-tweak.patch b/patch/kernel/rockchip64-current/board-nanopi-m4v2-dts-ethernet-tweak.patch
new file mode 100644
index 0000000000..bb2cef90f2
--- /dev/null
+++ b/patch/kernel/rockchip64-current/board-nanopi-m4v2-dts-ethernet-tweak.patch
@@ -0,0 +1,15 @@
+diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4v2.dts b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4v2.dts
+index 60358ab8c..057045ca3 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4v2.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4v2.dts
+@@ -48,6 +48,10 @@
+ 	};
+ };
+ 
++&gmac {
++	rx_delay = <0x16>;
++};
++
+ &vcc3v3_sys {
+ 	vin-supply = <&vcc5v0_core>;
+ };
diff --git a/patch/kernel/rockchip64-current/board-nanopi-m4v2-dts.patch b/patch/kernel/rockchip64-current/board-nanopi-m4v2-dts.patch
deleted file mode 100644
index 8339d37391..0000000000
--- a/patch/kernel/rockchip64-current/board-nanopi-m4v2-dts.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
-index 948195b49..48dccb95e 100644
---- a/arch/arm64/boot/dts/rockchip/Makefile
-+++ b/arch/arm64/boot/dts/rockchip/Makefile
-@@ -22,6 +22,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-captain.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-v.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopc-t4.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4.dtb
-+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4v2.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-neo4.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-orangepi.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pinebook-pro.dtb
-diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4v2.dts b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4v2.dts
-new file mode 120000
-index 000000000..5c27e6fc3
---- /dev/null
-+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4v2.dts
-@@ -0,0 +1 @@
-+rk3399-nanopi-m4.dts
-\ No newline at end of file
diff --git a/patch/kernel/rockchip64-dev/add-board-nanopi-m4v2.patch b/patch/kernel/rockchip64-dev/add-board-nanopi-m4v2.patch
new file mode 100644
index 0000000000..ba844c8b80
--- /dev/null
+++ b/patch/kernel/rockchip64-dev/add-board-nanopi-m4v2.patch
@@ -0,0 +1,84 @@
+diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
+index 948195b49..48dccb95e 100644
+--- a/arch/arm64/boot/dts/rockchip/Makefile
++++ b/arch/arm64/boot/dts/rockchip/Makefile
+@@ -22,6 +22,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-captain.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-v.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopc-t4.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4.dtb
++dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4v2.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-neo4.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-orangepi.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pinebook-pro.dtb
+diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4v2.dts b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4v2.dts
+new file mode 100644
+index 000000000..60358ab8c
+--- /dev/null
++++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4v2.dts
+@@ -0,0 +1,66 @@
++// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
++/*
++ * FriendlyElec NanoPi M4V2 board device tree source
++ *
++ * Copyright (c) 2018 FriendlyElec Computer Tech. Co., Ltd.
++ * (http://www.friendlyarm.com)
++ *
++ * Copyright (c) 2018 Collabora Ltd.
++ * Copyright (c) 2019 Arm Ltd.
++ */
++
++/dts-v1/;
++#include "rk3399-nanopi4.dtsi"
++
++/ {
++	model = "FriendlyElec NanoPi M4 Ver2.0";
++	compatible = "friendlyarm,nanopi-m4", "rockchip,rk3399";
++
++	vdd_5v: vdd-5v {
++		compatible = "regulator-fixed";
++		regulator-name = "vdd_5v";
++		regulator-always-on;
++		regulator-boot-on;
++	};
++
++	vcc5v0_core: vcc5v0-core {
++		compatible = "regulator-fixed";
++		regulator-name = "vcc5v0_core";
++		regulator-always-on;
++		regulator-boot-on;
++		vin-supply = <&vdd_5v>;
++	};
++
++	vcc5v0_usb1: vcc5v0-usb1 {
++		compatible = "regulator-fixed";
++		regulator-name = "vcc5v0_usb1";
++		regulator-always-on;
++		regulator-boot-on;
++		vin-supply = <&vcc5v0_sys>;
++	};
++
++	vcc5v0_usb2: vcc5v0-usb2 {
++		compatible = "regulator-fixed";
++		regulator-name = "vcc5v0_usb2";
++		regulator-always-on;
++		regulator-boot-on;
++		vin-supply = <&vcc5v0_sys>;
++	};
++};
++
++&vcc3v3_sys {
++	vin-supply = <&vcc5v0_core>;
++};
++
++&u2phy0_host {
++	phy-supply = <&vcc5v0_usb1>;
++};
++
++&u2phy1_host {
++	phy-supply = <&vcc5v0_usb2>;
++};
++
++&vbus_typec {
++	regulator-always-on;
++	vin-supply = <&vdd_5v>;
++};
diff --git a/patch/kernel/rockchip64-dev/board-nanopi-m4v2-dts-ethernet-tweak.patch b/patch/kernel/rockchip64-dev/board-nanopi-m4v2-dts-ethernet-tweak.patch
new file mode 100644
index 0000000000..bb2cef90f2
--- /dev/null
+++ b/patch/kernel/rockchip64-dev/board-nanopi-m4v2-dts-ethernet-tweak.patch
@@ -0,0 +1,15 @@
+diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4v2.dts b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4v2.dts
+index 60358ab8c..057045ca3 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4v2.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4v2.dts
+@@ -48,6 +48,10 @@
+ 	};
+ };
+ 
++&gmac {
++	rx_delay = <0x16>;
++};
++
+ &vcc3v3_sys {
+ 	vin-supply = <&vcc5v0_core>;
+ };
diff --git a/patch/kernel/rockchip64-dev/board-nanopi-m4v2-dts.patch b/patch/kernel/rockchip64-dev/board-nanopi-m4v2-dts.patch
deleted file mode 100644
index 8339d37391..0000000000
--- a/patch/kernel/rockchip64-dev/board-nanopi-m4v2-dts.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
-index 948195b49..48dccb95e 100644
---- a/arch/arm64/boot/dts/rockchip/Makefile
-+++ b/arch/arm64/boot/dts/rockchip/Makefile
-@@ -22,6 +22,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-captain.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-v.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopc-t4.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4.dtb
-+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4v2.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-neo4.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-orangepi.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pinebook-pro.dtb
-diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4v2.dts b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4v2.dts
-new file mode 120000
-index 000000000..5c27e6fc3
---- /dev/null
-+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4v2.dts
-@@ -0,0 +1 @@
-+rk3399-nanopi-m4.dts
-\ No newline at end of file