diff --git a/arch/arm64/boot/dts/amlogic/mesons5.dtsi b/arch/arm64/boot/dts/amlogic/mesons5.dtsi
index cb990315d..5001fa6dd 100644
--- a/arch/arm64/boot/dts/amlogic/mesons5.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesons5.dtsi
@@ -2074,6 +2074,17 @@
 			/* standards.ieee.org/develop/regauth/oui/oui.txt */
 			vendor_id = <0x000000>;
 		};
+
+		ports {
+			port {
+				#address-cells = <1>;
+				#size-cells = <0>;
+				hdmitx_to_drm: endpoint@0 {
+					reg = <0>;
+					remote-endpoint = <0>;
+				};
+			};
+		};
 	};
 
 	aocec: aocec {
diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201.dts
index 698e6b051..6ee04e39c 100644
--- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201.dts
+++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201.dts
@@ -159,15 +159,14 @@
 		ion_cma_reserved:linux,ion-dev {
 			compatible = "shared-dma-pool";
 			reusable;
-			size = <0x0 0x5000000>;
+			size = <0x0 0x0>;
 			alignment = <0x0 0x400000>;
 		};
 
 		ion_fb_reserved:linux,ion-fb {
 			compatible = "shared-dma-pool";
 			reusable;
-			/* 3840x2160x4x4 round up 4M align */
-			size = <0x0 0x8400000>;
+			size = <0x0 0x0>;
 			alignment = <0x0 0x400000>;
 			alloc-ranges = <0x0 0x0 0x0 0xe0000000>;
 		};
@@ -187,6 +186,21 @@
 			//no-map;
 		};
 
+		dmaheap_cma_reserved:heap-gfx {
+			compatible = "shared-dma-pool";
+			reusable;
+			/* 4k STB androidT size 4M */
+			size = <0x0 0x400000>;
+			alignment = <0x0 0x400000>;
+		};
+		dmaheap_fb_reserved:heap-fb {
+			compatible = "shared-dma-pool";
+			reusable;
+			/* 4k STB androidT size 212M */
+			size = <0x0 0xd400000>;
+			alignment = <0x0 0x400000>;
+		};
+
 		/*  vdin0 CMA pool */
 		/*vdin0_cma_reserved:linux,vdin0_cma {*/
 		/*	compatible = "shared-dma-pool";*/
diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_drm.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_drm.dts
index 7da1684cf..8077e95c6 100644
--- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_drm.dts
+++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_drm.dts
@@ -159,15 +159,14 @@
 		ion_cma_reserved:linux,ion-dev {
 			compatible = "shared-dma-pool";
 			reusable;
-			size = <0x0 0x5000000>;
+			size = <0x0 0x0>;
 			alignment = <0x0 0x400000>;
 		};
 
 		ion_fb_reserved:linux,ion-fb {
 			compatible = "shared-dma-pool";
 			reusable;
-			/* 3840x2160x4x6 round up 4M align , tmp solution for Android R*/
-			size = <0x0 0xd000000>;
+			size = <0x0 0x0>;
 			alignment = <0x0 0x400000>;
 			alloc-ranges = <0x0 0x0 0x0 0xe0000000>;
 		};
@@ -187,6 +186,21 @@
 			//no-map;
 		};
 
+		dmaheap_cma_reserved:heap-gfx {
+			compatible = "shared-dma-pool";
+			reusable;
+			/* 4k STB androidT size 4M */
+			size = <0x0 0x400000>;
+			alignment = <0x0 0x400000>;
+		};
+		dmaheap_fb_reserved:heap-fb {
+			compatible = "shared-dma-pool";
+			reusable;
+			/* 4k STB androidT size 212M */
+			size = <0x0 0xd400000>;
+			alignment = <0x0 0x400000>;
+		};
+
 		/*  vdin0 CMA pool */
 		/*vdin0_cma_reserved:linux,vdin0_cma {*/
 		/*	compatible = "shared-dma-pool";*/
diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_linux.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_linux.dts
index 9c9218be6..5eeaf6def 100644
--- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_linux.dts
+++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_linux.dts
@@ -159,15 +159,14 @@
 		ion_cma_reserved:linux,ion-dev {
 			compatible = "shared-dma-pool";
 			reusable;
-			size = <0x0 0x5000000>;
+			size = <0x0 0x0>;
 			alignment = <0x0 0x400000>;
 		};
 
 		ion_fb_reserved:linux,ion-fb {
 			compatible = "shared-dma-pool";
 			reusable;
-			/* 3840x2160x4x4 round up 4M align */
-			size = <0x0 0x8400000>;
+			size = <0x0 0x0>;
 			alignment = <0x0 0x400000>;
 		};
 		/* secure ion for gpu,advice size is 0x1c800000 */
@@ -186,6 +185,21 @@
 			//no-map;
 		};
 
+		dmaheap_cma_reserved:heap-gfx {
+			compatible = "shared-dma-pool";
+			reusable;
+			/* 4k STB androidT size 4M */
+			size = <0x0 0x400000>;
+			alignment = <0x0 0x400000>;
+		};
+		dmaheap_fb_reserved:heap-fb {
+			compatible = "shared-dma-pool";
+			reusable;
+			/* 4k STB androidT size 212M */
+			size = <0x0 0xd400000>;
+			alignment = <0x0 0x400000>;
+		};
+
 		/*  vdin0 CMA pool */
 		/*vdin0_cma_reserved:linux,vdin0_cma {*/
 		/*	compatible = "shared-dma-pool";*/
diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2.dts
index 71e77eba3..2e7a569b7 100644
--- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2.dts
+++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2.dts
@@ -159,15 +159,14 @@
 		ion_cma_reserved:linux,ion-dev {
 			compatible = "shared-dma-pool";
 			reusable;
-			size = <0x0 0x5000000>;
+			size = <0x0 0x0>;
 			alignment = <0x0 0x400000>;
 		};
 
 		ion_fb_reserved:linux,ion-fb {
 			compatible = "shared-dma-pool";
 			reusable;
-			/* 3840x2160x4x4 round up 4M align */
-			size = <0x0 0x8400000>;
+			size = <0x0 0x0>;
 			alignment = <0x0 0x400000>;
 			alloc-ranges = <0x0 0x0 0x0 0xe0000000>;
 		};
@@ -187,6 +186,21 @@
 			//no-map;
 		};
 
+		dmaheap_cma_reserved:heap-gfx {
+			compatible = "shared-dma-pool";
+			reusable;
+			/* 4k STB androidT size 4M */
+			size = <0x0 0x400000>;
+			alignment = <0x0 0x400000>;
+		};
+		dmaheap_fb_reserved:heap-fb {
+			compatible = "shared-dma-pool";
+			reusable;
+			/* 4k STB androidT size 212M */
+			size = <0x0 0xd400000>;
+			alignment = <0x0 0x400000>;
+		};
+
 		/*  vdin0 CMA pool */
 		/*vdin0_cma_reserved:linux,vdin0_cma {*/
 		/*	compatible = "shared-dma-pool";*/
diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_drm.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_drm.dts
index 9ad636a74..5b975d217 100644
--- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_drm.dts
+++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_drm.dts
@@ -159,15 +159,14 @@
 		ion_cma_reserved:linux,ion-dev {
 			compatible = "shared-dma-pool";
 			reusable;
-			size = <0x0 0x5000000>;
+			size = <0x0 0x0>;
 			alignment = <0x0 0x400000>;
 		};
 
 		ion_fb_reserved:linux,ion-fb {
 			compatible = "shared-dma-pool";
 			reusable;
-			/* 3840x2160x4x6 round up 4M align , tmp solution for Android R*/
-			size = <0x0 0xd000000>;
+			size = <0x0 0x0>;
 			alignment = <0x0 0x400000>;
 			alloc-ranges = <0x0 0x0 0x0 0xe0000000>;
 		};
@@ -187,6 +186,21 @@
 			//no-map;
 		};
 
+		dmaheap_cma_reserved:heap-gfx {
+			compatible = "shared-dma-pool";
+			reusable;
+			/* 4k STB androidT size 4M */
+			size = <0x0 0x400000>;
+			alignment = <0x0 0x400000>;
+		};
+		dmaheap_fb_reserved:heap-fb {
+			compatible = "shared-dma-pool";
+			reusable;
+			/* 4k STB androidT size 212M */
+			size = <0x0 0xd400000>;
+			alignment = <0x0 0x400000>;
+		};
+
 		/*  vdin0 CMA pool */
 		/*vdin0_cma_reserved:linux,vdin0_cma {*/
 		/*	compatible = "shared-dma-pool";*/
diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_linux.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_linux.dts
index d618e80ed..f9f5080d1 100644
--- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_linux.dts
+++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_linux.dts
@@ -159,15 +159,14 @@
 		ion_cma_reserved:linux,ion-dev {
 			compatible = "shared-dma-pool";
 			reusable;
-			size = <0x0 0x5000000>;
+			size = <0x0 0x0>;
 			alignment = <0x0 0x400000>;
 		};
 
 		ion_fb_reserved:linux,ion-fb {
 			compatible = "shared-dma-pool";
 			reusable;
-			/* 3840x2160x4x4 round up 4M align */
-			size = <0x0 0x8400000>;
+			size = <0x0 0x0>;
 			alignment = <0x0 0x400000>;
 		};
 		/* secure ion for gpu,advice size is 0x1c800000 */
@@ -186,6 +185,21 @@
 			//no-map;
 		};
 
+		dmaheap_cma_reserved:heap-gfx {
+			compatible = "shared-dma-pool";
+			reusable;
+			/* 4k STB androidT size 4M */
+			size = <0x0 0x400000>;
+			alignment = <0x0 0x400000>;
+		};
+		dmaheap_fb_reserved:heap-fb {
+			compatible = "shared-dma-pool";
+			reusable;
+			/* 4k STB androidT size 212M */
+			size = <0x0 0xd400000>;
+			alignment = <0x0 0x400000>;
+		};
+
 		/*  vdin0 CMA pool */
 		/*vdin0_cma_reserved:linux,vdin0_cma {*/
 		/*	compatible = "shared-dma-pool";*/
diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax208.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax208.dts
index 33d745c21..0f0df9056 100644
--- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax208.dts
+++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax208.dts
@@ -158,15 +158,14 @@
 		ion_cma_reserved:linux,ion-dev {
 			compatible = "shared-dma-pool";
 			reusable;
-			size = <0x0 0x5000000>;
+			size = <0x0 0x0>;
 			alignment = <0x0 0x400000>;
 		};
 
 		ion_fb_reserved:linux,ion-fb {
 			compatible = "shared-dma-pool";
 			reusable;
-			/* 3840x2160x4x4 round up 4M align */
-			size = <0x0 0x8000000>;
+			size = <0x0 0x0>;
 			alignment = <0x0 0x400000>;
 			alloc-ranges = <0x0 0x0 0x0 0xe0000000>;
 		};
@@ -186,6 +185,21 @@
 			//no-map;
 		};
 
+		dmaheap_cma_reserved:heap-gfx {
+			compatible = "shared-dma-pool";
+			reusable;
+			/* 4k STB androidT size 4M */
+			size = <0x0 0x400000>;
+			alignment = <0x0 0x400000>;
+		};
+		dmaheap_fb_reserved:heap-fb {
+			compatible = "shared-dma-pool";
+			reusable;
+			/* 4k STB androidT size 212M */
+			size = <0x0 0xd400000>;
+			alignment = <0x0 0x400000>;
+		};
+
 		/*  vdin0 CMA pool */
 		/*vdin0_cma_reserved:linux,vdin0_cma {*/
 		/*	compatible = "shared-dma-pool";*/
diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax208_v2.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax208_v2.dts
index 800ecdb28..28e6d5b07 100644
--- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax208_v2.dts
+++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax208_v2.dts
@@ -158,15 +158,14 @@
 		ion_cma_reserved:linux,ion-dev {
 			compatible = "shared-dma-pool";
 			reusable;
-			size = <0x0 0x5000000>;
+			size = <0x0 0x0>;
 			alignment = <0x0 0x400000>;
 		};
 
 		ion_fb_reserved:linux,ion-fb {
 			compatible = "shared-dma-pool";
 			reusable;
-			/* 3840x2160x4x4 round up 4M align */
-			size = <0x0 0x8000000>;
+			size = <0x0 0x0>;
 			alignment = <0x0 0x400000>;
 			alloc-ranges = <0x0 0x0 0x0 0xe0000000>;
 		};
@@ -186,6 +185,21 @@
 			//no-map;
 		};
 
+		dmaheap_cma_reserved:heap-gfx {
+			compatible = "shared-dma-pool";
+			reusable;
+			/* 4k STB androidT size 4M */
+			size = <0x0 0x400000>;
+			alignment = <0x0 0x400000>;
+		};
+		dmaheap_fb_reserved:heap-fb {
+			compatible = "shared-dma-pool";
+			reusable;
+			/* 4k STB androidT size 212M */
+			size = <0x0 0xd400000>;
+			alignment = <0x0 0x400000>;
+		};
+
 		/*  vdin0 CMA pool */
 		/*vdin0_cma_reserved:linux,vdin0_cma {*/
 		/*	compatible = "shared-dma-pool";*/
diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax209.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax209.dts
index 9ee13fef0..1c30cbd58 100644
--- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax209.dts
+++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax209.dts
@@ -158,15 +158,14 @@
 		ion_cma_reserved:linux,ion-dev {
 			compatible = "shared-dma-pool";
 			reusable;
-			size = <0x0 0x5000000>;
+			size = <0x0 0x0>;
 			alignment = <0x0 0x400000>;
 		};
 
 		ion_fb_reserved:linux,ion-fb {
 			compatible = "shared-dma-pool";
 			reusable;
-			/* 3840x2160x4x4 round up 4M align */
-			size = <0x0 0x8000000>;
+			size = <0x0 0x0>;
 			alignment = <0x0 0x400000>;
 			alloc-ranges = <0x0 0x0 0x0 0xe0000000>;
 		};
@@ -186,6 +185,21 @@
 			//no-map;
 		};
 
+		dmaheap_cma_reserved:heap-gfx {
+			compatible = "shared-dma-pool";
+			reusable;
+			/* 4k STB androidT size 4M */
+			size = <0x0 0x400000>;
+			alignment = <0x0 0x400000>;
+		};
+		dmaheap_fb_reserved:heap-fb {
+			compatible = "shared-dma-pool";
+			reusable;
+			/* 4k STB androidT size 212M */
+			size = <0x0 0xd400000>;
+			alignment = <0x0 0x400000>;
+		};
+
 		/*  vdin0 CMA pool */
 		/*vdin0_cma_reserved:linux,vdin0_cma {*/
 		/*	compatible = "shared-dma-pool";*/
diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax209_v2.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax209_v2.dts
index eebad8763..9fc10b206 100644
--- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax209_v2.dts
+++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax209_v2.dts
@@ -158,15 +158,14 @@
 		ion_cma_reserved:linux,ion-dev {
 			compatible = "shared-dma-pool";
 			reusable;
-			size = <0x0 0x5000000>;
+			size = <0x0 0x0>;
 			alignment = <0x0 0x400000>;
 		};
 
 		ion_fb_reserved:linux,ion-fb {
 			compatible = "shared-dma-pool";
 			reusable;
-			/* 3840x2160x4x4 round up 4M align */
-			size = <0x0 0x8000000>;
+			size = <0x0 0x0>;
 			alignment = <0x0 0x400000>;
 			alloc-ranges = <0x0 0x0 0x0 0xe0000000>;
 		};
@@ -186,6 +185,21 @@
 			//no-map;
 		};
 
+		dmaheap_cma_reserved:heap-gfx {
+			compatible = "shared-dma-pool";
+			reusable;
+			/* 4k STB androidT size 4M */
+			size = <0x0 0x400000>;
+			alignment = <0x0 0x400000>;
+		};
+		dmaheap_fb_reserved:heap-fb {
+			compatible = "shared-dma-pool";
+			reusable;
+			/* 4k STB androidT size 212M */
+			size = <0x0 0xd400000>;
+			alignment = <0x0 0x400000>;
+		};
+
 		/*  vdin0 CMA pool */
 		/*vdin0_cma_reserved:linux,vdin0_cma {*/
 		/*	compatible = "shared-dma-pool";*/