dts:txl:sync fb config with txlx

PD#171168:dts:txl:sync fb config with txlx

Change-Id: I17f2521c5c571258c249ed042dc2978ebb21a5f9
Signed-off-by: Lei Qian <lei.qian@amlogic.com>

5 files changed, 84 insertions, 53 deletions

diff --git a/arch/arm64/boot/dts/amlogic/mesontxl.dtsi b/arch/arm64/boot/dts/amlogic/mesontxl.dtsi
index e040bd6..dba40c9 100644
--- a/arch/arm64/boot/dts/amlogic/mesontxl.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesontxl.dtsi
@@ -985,22 +985,6 @@
 		interrupt-names = "rdma";
 	};
 
-	meson_fb: fb {
-		compatible = "amlogic, meson-txl";
-		memory-region = <&logo_reserved>;
-		dev_name = "meson-fb";
-		status = "disable";
-		interrupts = <0 3 1
-			0 89 1>;
-		interrupt-names = "viu-vsync", "rdma";
-		/* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000*/
-		display_mode_default = "1080p60hz";
-		scale_mode = <1>;
-		/** 0:VPU free scale 1:OSD free scale 2:OSD super scale */
-		display_size_default = <1920 1080 1920 2160 32>;
-		/*1920*1080*4*3 = 0x17BB000*/
-	};
-
 	audio_data: audio_data {
 		compatible = "amlogic, audio_data";
 		query_licence_cmd = <0x82000050>;
diff --git a/arch/arm64/boot/dts/amlogic/txl_t950_p341.dts b/arch/arm64/boot/dts/amlogic/txl_t950_p341.dts
index 1cedbe6..fa1a464 100644
--- a/arch/arm64/boot/dts/amlogic/txl_t950_p341.dts
+++ b/arch/arm64/boot/dts/amlogic/txl_t950_p341.dts
@@ -81,7 +81,8 @@
 		ion_reserved:linux,ion-dev {
 			compatible = "shared-dma-pool";
 			reusable;
-			size = <0x0 0x2000000>;
+			// if no direct render, ion size = fb0_size x 3 + fb1_size + 4 M
+			size = <0x0 0x2400000>;
 			alignment = <0x0 0x400000>;
 		};
 
@@ -214,6 +215,25 @@
 		set_fault_tolerance = <1>;
 	};
 
+	meson-fb {
+               compatible = "amlogic, meson-txl";
+		memory-region = <&logo_reserved>;
+		dev_name = "meson-fb";
+		status = "okay";
+		interrupts = <0 3 1
+			0 89 1>;
+		interrupt-names = "viu-vsync", "rdma";
+		mem_size = <0x00800000 0x01800000 0x00100000>;
+		/* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000*/
+		display_mode_default = "1080p60hz";
+		/* 0:VPU free scale 1:OSD free scale 2:OSD super scale */
+		scale_mode = <1>;
+		/* 1920*1080*4*3 = 0x17BB000 */
+		display_size_default = <1920 1080 1920 3240 32>;
+		pxp_mode = <0>; /** 0:normal mode 1:pxp mode */
+		logo_addr = "0x3f800000";
+	};
+
 	picdec {
 		compatible = "amlogic, picdec";
 		status = "okay";
@@ -1045,11 +1065,3 @@
 	status = "okay";
 };
 
-&meson_fb {
-	status = "okay";
-	display_size_default = <1920 1080 1920 2160 32>;
-	mem_size = <0x00800000 0x1980000 0x100000>;
-	logo_addr = "0x3f800000";
-	mem_alloc = <0>;
-	pxp_mode = <0>; /** 0:normal mode 1:pxp mode */
-};
diff --git a/arch/arm64/boot/dts/amlogic/txl_t960_p346.dts b/arch/arm64/boot/dts/amlogic/txl_t960_p346.dts
index c70c0be..e94fa04 100644
--- a/arch/arm64/boot/dts/amlogic/txl_t960_p346.dts
+++ b/arch/arm64/boot/dts/amlogic/txl_t960_p346.dts
@@ -81,7 +81,8 @@
 		ion_reserved:linux,ion-dev {
 			compatible = "shared-dma-pool";
 			reusable;
-			size = <0x0 0x2000000>;
+			// if no direct render, ion size = fb0_size x 3 + fb1_size + 4 M
+			size = <0x0 0x2400000>;
 			alignment = <0x0 0x400000>;
 		};
 
@@ -215,6 +216,25 @@
 		set_fault_tolerance = <1>;
 	};
 
+	meson-fb {
+               compatible = "amlogic, meson-txl";
+		memory-region = <&logo_reserved>;
+		dev_name = "meson-fb";
+		status = "okay";
+		interrupts = <0 3 1
+			0 89 1>;
+		interrupt-names = "viu-vsync", "rdma";
+		mem_size = <0x00800000 0x01800000 0x00100000>;
+		/* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000*/
+		display_mode_default = "1080p60hz";
+		/* 0:VPU free scale 1:OSD free scale 2:OSD super scale */
+		scale_mode = <1>;
+		/* 1920*1080*4*3 = 0x17BB000 */
+		display_size_default = <1920 1080 1920 3240 32>;
+		pxp_mode = <0>; /** 0:normal mode 1:pxp mode */
+		logo_addr = "0x3f800000";
+	};
+
 	picdec {
 		compatible = "amlogic, picdec";
 		status = "okay";
@@ -1052,11 +1072,3 @@
 	status = "okay";
 };
 
-&meson_fb {
-	status = "okay";
-	display_size_default = <1920 1080 1920 2160 32>;
-	mem_size = <0x00800000 0x1980000 0x100000>;
-	logo_addr = "0x3f800000";
-	mem_alloc = <0>;
-	pxp_mode = <0>; /** 0:normal mode 1:pxp mode */
-};
diff --git a/arch/arm64/boot/dts/amlogic/txl_t962_p320.dts b/arch/arm64/boot/dts/amlogic/txl_t962_p320.dts
index 01294000..3f17de1 100644
--- a/arch/arm64/boot/dts/amlogic/txl_t962_p320.dts
+++ b/arch/arm64/boot/dts/amlogic/txl_t962_p320.dts
@@ -81,7 +81,8 @@
 		ion_reserved:linux,ion-dev {
 			compatible = "shared-dma-pool";
 			reusable;
-			size = <0x0 0x8000000>;
+			// if no direct render, ion size = fb0_size x 3 + fb1_size + 4 M
+			size = <0x0 0x2400000>;
 			alignment = <0x0 0x400000>;
 		};
 
@@ -206,6 +207,25 @@
 		set_fault_tolerance = <1>;
 	};
 
+	meson-fb {
+               compatible = "amlogic, meson-txl";
+		memory-region = <&logo_reserved>;
+		dev_name = "meson-fb";
+		status = "okay";
+		interrupts = <0 3 1
+			0 89 1>;
+		interrupt-names = "viu-vsync", "rdma";
+		mem_size = <0x00800000 0x01800000 0x00100000>;
+		/* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000*/
+		display_mode_default = "1080p60hz";
+		/* 0:VPU free scale 1:OSD free scale 2:OSD super scale */
+		scale_mode = <1>;
+		/* 1920*1080*4*3 = 0x17BB000 */
+		display_size_default = <1920 1080 1920 3240 32>;
+		pxp_mode = <0>; /** 0:normal mode 1:pxp mode */
+		logo_addr = "0x3f800000";
+	};
+
 	picdec {
 		compatible = "amlogic, picdec";
 		status = "okay";
@@ -1062,11 +1082,3 @@
 	status = "okay";
 };
 
-&meson_fb {
-	status = "okay";
-	display_size_default = <1920 1080 1920 2160 32>;
-	mem_size = <0x00800000 0x1980000 0x100000 0x100000 0x800000>;
-	logo_addr = "0x3f800000";
-	mem_alloc = <0>;
-	pxp_mode = <0>; /** 0:normal mode 1:pxp mode */
-};
diff --git a/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts b/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts
index 9527482..c4db667 100644
--- a/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts
+++ b/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts
@@ -81,7 +81,8 @@
 		ion_reserved:linux,ion-dev {
 			compatible = "shared-dma-pool";
 			reusable;
-			size = <0x0 0x2000000>;
+			// if no direct render, ion size = fb0_size x 3 + fb1_size + 4 M
+			size = <0x0 0x2400000>;
 			alignment = <0x0 0x400000>;
 		};
 
@@ -205,6 +206,25 @@
 		set_fault_tolerance = <1>;
 	};
 
+	meson-fb {
+               compatible = "amlogic, meson-txl";
+		memory-region = <&logo_reserved>;
+		dev_name = "meson-fb";
+		status = "okay";
+		interrupts = <0 3 1
+			0 89 1>;
+		interrupt-names = "viu-vsync", "rdma";
+		mem_size = <0x00800000 0x01800000 0x00100000>;
+		/* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000*/
+		display_mode_default = "1080p60hz";
+		/* 0:VPU free scale 1:OSD free scale 2:OSD super scale */
+		scale_mode = <1>;
+		/* 1920*1080*4*3 = 0x17BB000 */
+		display_size_default = <1920 1080 1920 3240 32>;
+		pxp_mode = <0>; /** 0:normal mode 1:pxp mode */
+		logo_addr = "0x3f800000";
+	};
+
 	picdec {
 		compatible = "amlogic, picdec";
 		status = "okay";
@@ -1066,15 +1086,6 @@
 	status = "okay";
 };
 
-&meson_fb {
-	status = "okay";
-	display_size_default = <1920 1080 1920 2160 32>;
-	mem_size = <0x00800000 0x1980000 0x100000 0x100000 0x800000>;
-	logo_addr = "0x3f800000";
-	mem_alloc = <0>;
-	pxp_mode = <0>; /** 0:normal mode 1:pxp mode */
-};
-
 &spicc {
 	status = "disabled";
 	pinctrl-names = "default";