From: Zhiwei Yuan <zhiwei.yuan@amlogic.com>
Date: Thu, 6 Dec 2018 06:18:07 +0000 (+0800)
Subject: dts: TL1 ，change demod 8MB memory to CMA mode. [1/1]
X-Git-Tag: hardkernel-4.9.236-104~2069
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b847f7426943b78fa763e66fed2bc86d4b4793d3;p=platform%2Fkernel%2Flinux-amlogic.git

dts: TL1 ，change demod 8MB memory to CMA mode. [1/1]

PD#SWPL-2913

Problem:
for tl1 memory usage measurement

Solution:
use cma memory for dtmb instead of reserved

Verify:
verified by t962x2_x301

Change-Id: I7f5381a8458f5bbd9bbffc02c7fd792af92b783d
Signed-off-by: Zhiwei Yuan <zhiwei.yuan@amlogic.com>
---

diff --git a/arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts b/arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts
index 15a1ecd..0a4b9a1 100644
--- a/arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts
+++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts
@@ -111,12 +111,21 @@
 			alignment = <0x400000>;
 		};
 
-		demod_reserved:linux,demod {
-			compatible = "amlogic, demod-mem";
-			size = <0x800000>; //8M //100m 0x6400000
-			alloc-ranges = <0x0 0x30000000>;
-			//multi-use;
-			//no-map;
+		/*demod_reserved:linux,demod {
+		 *	compatible = "amlogic, demod-mem";
+		 *	size = <0x800000>; //8M //100m 0x6400000
+		 *	alloc-ranges = <0x0 0x30000000>;
+		 *	//multi-use;
+		 *	//no-map;
+		 *};
+		 */
+
+		demod_cma_reserved:linux,demod_cma {
+			compatible = "shared-dma-pool";
+			reusable;
+			/* 8M */
+			size = <0x0800000>;
+			alignment = <0x400000>;
 		};
 
 		/*vbi reserved mem*/
@@ -245,9 +254,9 @@
 		/*move from dvbfe*/
 		dtv_demod0_mem = <0>;	// need move to aml_dtv_demod ?
 		spectrum = <1>;
-		cma_flag = <0>;
+		cma_flag = <1>;
 		cma_mem_size = <8>;
-		memory-region = <&demod_reserved>;//<&demod_reserved>;
+		memory-region = <&demod_cma_reserved>;//<&demod_reserved>;
 	};
 
 	auge_sound {
diff --git a/arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts b/arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts
index 812837a..0949361 100644
--- a/arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts
+++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts
@@ -111,12 +111,21 @@
 			alignment = <0x400000>;
 		};
 
-		demod_reserved:linux,demod {
-			compatible = "amlogic, demod-mem";
-			size = <0x800000>; //8M //100m 0x6400000
-			alloc-ranges = <0x0 0x30000000>;
-			//multi-use;
-			//no-map;
+		/*demod_reserved:linux,demod {
+		 *	compatible = "amlogic, demod-mem";
+		 *	size = <0x800000>; //8M //100m 0x6400000
+		 *	alloc-ranges = <0x0 0x30000000>;
+		 *	//multi-use;
+		 *	//no-map;
+		 *};
+		 */
+
+		demod_cma_reserved:linux,demod_cma {
+			compatible = "shared-dma-pool";
+			reusable;
+			/* 8M */
+			size = <0x0800000>;
+			alignment = <0x400000>;
 		};
 
 		/*vbi reserved mem*/
@@ -244,9 +253,9 @@
 
 		dtv_demod0_mem = <0>;	// need move to aml_dtv_demod ?
 		spectrum = <1>;
-		cma_flag = <0>;
+		cma_flag = <1>;
 		cma_mem_size = <8>;
-		memory-region = <&demod_reserved>;//<&demod_reserved>;
+		memory-region = <&demod_cma_reserved>;//<&demod_reserved>;
 	};
 
 	auge_sound {
diff --git a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301.dts b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301.dts
index 5f73946..4d368fa 100644
--- a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301.dts
+++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301.dts
@@ -111,12 +111,21 @@
 			alignment = <0x400000>;
 		};
 
-		demod_reserved:linux,demod {
-			compatible = "amlogic, demod-mem";
-			size = <0x800000>; //8M //100m 0x6400000
-			alloc-ranges = <0x0 0x30000000>;
-			//multi-use;
-			//no-map;
+		/*demod_reserved:linux,demod {
+		 *	compatible = "amlogic, demod-mem";
+		 *	size = <0x800000>; //8M //100m 0x6400000
+		 *	alloc-ranges = <0x0 0x30000000>;
+		 *	//multi-use;
+		 *	//no-map;
+		 *};
+		 */
+
+		demod_cma_reserved:linux,demod_cma {
+			compatible = "shared-dma-pool";
+			reusable;
+			/* 8M */
+			size = <0x0800000>;
+			alignment = <0x400000>;
 		};
 
 		/*vbi reserved mem*/
@@ -244,9 +253,9 @@
 
 		dtv_demod0_mem = <0>;	// need move to aml_dtv_demod ?
 		spectrum = <1>;
-		cma_flag = <0>;
+		cma_flag = <1>;
 		cma_mem_size = <8>;
-		memory-region = <&demod_reserved>;//<&demod_reserved>;
+		memory-region = <&demod_cma_reserved>;//<&demod_reserved>;
 	};
 
 	auge_sound {