arm64: dts: vdin: use discontinus way to alloc cma

PD#170275: arm64: dts: vdin: use discontinus way to alloc cma

Change-Id: I9a0ed8e612a98f5558f90df2b91b3384e954b9e4
Signed-off-by: xuhua zhang <xuhua.zhang@amlogic.com>

diff --git a/arch/arm64/boot/dts/amlogic/txl_t950_p341.dts b/arch/arm64/boot/dts/amlogic/txl_t950_p341.dts
index 07c69b4b30ec85be71b5c2a2059548589b368cc6..e6a33ceb9a20a7c96568380e9a537556f4d6ee37 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txl_t950_p341.dts
+++ b/arch/arm64/boot/dts/amlogic/txl_t950_p341.dts
@@ -288,7 +288,9 @@
                dev_name = "vdin0";
                status = "okay";
                reserve-iomap = "true";
-               flag_cma = <1>;/*1:share with codec_mm;2:cma alone*/
+               /*bit0:(1:share with codec_mm;0:cma alone)*/
+               /*bit8:(1:alloc in discontinus way;0:alone in continuous way)*/
+               flag_cma = <0x101>;
                /* MByte, if 10bit disable: 64M(YUV422),
                 * if 10bit enable: 64*1.5 = 96M(YUV422)
                 * if support 4K2K-YUV444-10bit-WR:3840*2160*4*4 ~= 128M

diff --git a/arch/arm64/boot/dts/amlogic/txl_t960_p346.dts b/arch/arm64/boot/dts/amlogic/txl_t960_p346.dts
index 6d578dc9de9004bb71d52a3708ef2f24136b30a0..8cee2b17e0a56c395e9ca8cbe1a68a9ccc00280c 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txl_t960_p346.dts
+++ b/arch/arm64/boot/dts/amlogic/txl_t960_p346.dts
@@ -289,7 +289,9 @@
                dev_name = "vdin0";
                status = "okay";
                reserve-iomap = "true";
-               flag_cma = <1>;/*1:share with codec_mm;2:cma alone*/
+               /*bit0:(1:share with codec_mm;0:cma alone)*/
+               /*bit8:(1:alloc in discontinus way;0:alone in continuous way)*/
+               flag_cma = <0x101>;
                /* MByte, if 10bit disable: 64M(YUV422),
                 * if 10bit enable: 64*1.5 = 96M(YUV422)
                 * if support 4K2K-YUV444-10bit-WR:3840*2160*4*4 ~= 128M

diff --git a/arch/arm64/boot/dts/amlogic/txl_t962_p320.dts b/arch/arm64/boot/dts/amlogic/txl_t962_p320.dts
index d69b2726c32622511337a7039e45f9b8fdd91437..b792d3e4830642780648660f766c7815709948ee 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txl_t962_p320.dts
+++ b/arch/arm64/boot/dts/amlogic/txl_t962_p320.dts
@@ -280,7 +280,9 @@
                dev_name = "vdin0";
                status = "okay";
                reserve-iomap = "true";
-               flag_cma = <1>;/*1:share with codec_mm;2:cma alone*/
+               /*bit0:(1:share with codec_mm;0:cma alone)*/
+               /*bit8:(1:alloc in discontinus way;0:alone in continuous way)*/
+               flag_cma = <0x101>;
                /* MByte, if 10bit disable: 64M(YUV422),
                 * if 10bit enable: 64*1.5 = 96M(YUV422)
                 * if support 4K2K-YUV444-10bit-WR:3840*2160*4*4 ~= 128M

diff --git a/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts b/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts
index 733f324eb497f72041280343b22eec5d41222bf0..743eef8d59f123905a0abc4de6cc4ecc52489f3c 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts
+++ b/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts
@@ -289,7 +289,9 @@
                dev_name = "vdin0";
                status = "okay";
                reserve-iomap = "true";
-               flag_cma = <1>;/*1:share with codec_mm;2:cma alone*/
+               /*bit0:(1:share with codec_mm;0:cma alone)*/
+               /*bit8:(1:alloc in discontinus way;0:alone in continuous way)*/
+               flag_cma = <0x101>;
                /* MByte, if 10bit disable: 64M(YUV422),
                 * if 10bit enable: 64*1.5 = 96M(YUV422)
                 * if support 4K2K-YUV444-10bit-WR:3840*2160*4*4 ~= 128M

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts
index f376b8ac4d9479ca5073b4d53f51bef4e1a5572d..e391344e4aef3d2cdceb4c762db493d83752b8cf 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts
@@ -479,7 +479,9 @@
                dev_name = "vdin0";
                status = "okay";
                reserve-iomap = "true";
-               flag_cma = <1>;/*1:share with codec_mm;2:cma alone*/
+               /*bit0:(1:share with codec_mm;0:cma alone)*/
+               /*bit8:(1:alloc in discontinus way;0:alone in continuous way)*/
+               flag_cma = <0x101>;
                /* MByte, if 10bit disable: 64M(YUV422),
                 * if 10bit enable: 64*1.5 = 96M(YUV422)
                 * if support 4K2K-YUV444-10bit-WR:3840*2160*4*4 ~= 128M

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts
index 8cb1790a5934755ab82f3e85ca367023eacac2b5..3a65f1d81dd0f0c7865eed7ca3a4702e26a2bd6b 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts
@@ -533,7 +533,9 @@
                dev_name = "vdin0";
                status = "okay";
                reserve-iomap = "true";
-               flag_cma = <1>;/*1:share with codec_mm;2:cma alone*/
+               /*bit0:(1:share with codec_mm;0:cma alone)*/
+               /*bit8:(1:alloc in discontinus way;0:alone in continuous way)*/
+               flag_cma = <0x101>;
                /* MByte, if 10bit disable: 64M(YUV422),
                 * if 10bit enable: 64*1.5 = 96M(YUV422)
                 * if support 4K2K-YUV444-10bit-WR:3840*2160*4*4 ~= 128M

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
index df8ffd6e060f02fef951a2f4afddfa7a41db1795..ed37de261c257dc1000ea43a13efce30a39069f1 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
@@ -481,7 +481,9 @@
                dev_name = "vdin0";
                status = "okay";
                reserve-iomap = "true";
-               flag_cma = <1>;/*1:share with codec_mm;2:cma alone*/
+               /*bit0:(1:share with codec_mm;0:cma alone)*/
+               /*bit8:(1:alloc in discontinus way;0:alone in continuous way)*/
+               flag_cma = <0x101>;
                /* MByte, if 10bit disable: 64M(YUV422),
                 * if 10bit enable: 64*1.5 = 96M(YUV422)
                 * if support 4K2K-YUV444-10bit-WR:3840*2160*4*4 ~= 128M

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
index 580fb8072315f3a2458bef334d8808df05772d66..51c1476a8dbfb791d3cbedd1c7f33be0909623cb 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
@@ -481,7 +481,9 @@
                dev_name = "vdin0";
                status = "okay";
                reserve-iomap = "true";
-               flag_cma = <1>;/*1:share with codec_mm;2:cma alone*/
+               /*bit0:(1:share with codec_mm;0:cma alone)*/
+               /*bit8:(1:alloc in discontinus way;0:alone in continuous way)*/
+               flag_cma = <0x101>;
                /* MByte, if 10bit disable: 64M(YUV422),
                 * if 10bit enable: 64*1.5 = 96M(YUV422)
                 * if support 4K2K-YUV444-10bit-WR:3840*2160*4*4 ~= 128M

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts
index 0f5d8e08224d08dee9542a793e9b26b77700e15b..07f32c1b4da21d4c36ee304d4d1e31f2f2c14c66 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts
@@ -480,7 +480,9 @@
                dev_name = "vdin0";
                status = "okay";
                reserve-iomap = "true";
-               flag_cma = <1>;/*1:share with codec_mm;2:cma alone*/
+               /*bit0:(1:share with codec_mm;0:cma alone)*/
+               /*bit8:(1:alloc in discontinus way;0:alone in continuous way)*/
+               flag_cma = <0x101>;
                /* MByte, if 10bit disable: 64M(YUV422),
                 * if 10bit enable: 64*1.5 = 96M(YUV422)
                 * if support 4K2K-YUV444-10bit-WR:3840*2160*4*4 ~= 128M