diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
index 39c48e1fd8b29..3eec686223d6e 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
@@ -37,6 +37,19 @@
 		reg = <0x0 0xff8d0000 0x0 0x20000>; /* 128k */
 	};
 
+	ion {
+		compatible = "rockchip,ion";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cma-heap {
+			reg = <0x00000000 0x02000000>;
+		};
+
+		system-heap {
+		};
+	};
+
 	aliases {
 		ethernet0 = &gmac;
 	};
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8812au b/drivers/net/wireless/rockchip_wlan/rtl8812au
new file mode 160000
index 0000000000000..881375b5e2e08
--- /dev/null
+++ b/drivers/net/wireless/rockchip_wlan/rtl8812au
@@ -0,0 +1 @@
+Subproject commit 881375b5e2e0878e7628cc4c705de6fa2ace41ea