dts: add video_composer for tm2_t962e2_ab311. [1/1]

PD#SWPL-18651

Problem:
dts of tm2_t962e2_ab311 has no video_composer.

Solution:
add video_composer for tm2_t962e2_ab311.

Verify:
on T962E2-AB311

Change-Id: Ib2c845179cb9954e2f3c658958af21341b402b9f
Signed-off-by: renjiang.han <renjiang.han@amlogic.com>

diff --git a/arch/arm/boot/dts/amlogic/mesontm2.dtsi b/arch/arm/boot/dts/amlogic/mesontm2.dtsi
index 537afe7187eac3bdf297647102cd2a704e8b78f0..5b5c86f2dc75d90850a1828dd31b6a96dbe9350d 100644 (file)
--- a/arch/arm/boot/dts/amlogic/mesontm2.dtsi
+++ b/arch/arm/boot/dts/amlogic/mesontm2.dtsi
@@ -307,6 +307,11 @@
                /* 4: 333.3M    5: 400.0M    6: 500.0M    7: 666.7M */
        };
 
+       meson_uvm{
+               compatible = "amlogic, meson_uvm";
+               status = "okay";
+       };
+
        ethmac: ethernet@ff3f0000 {
                compatible = "amlogic, g12a-eth-dwmac","snps,dwmac";
                reg = <0xff3f0000 0x10000
@@ -1554,6 +1559,12 @@
                        "mailbox_2",
                        "parser_b";
        };
+       video_composer {
+               compatible = "amlogic, video_composer";
+               dev_name = "video_composer";
+               status = "okay";
+       };
+
        amvenc_avc{
                compatible = "amlogic, amvenc_avc";
                dev_name = "amvenc_avc";

diff --git a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts
index 2cf2fcad15e996b1e1cd6e0fa7e7bfd96598ffbf..73c0ef17a12280eb76bc2237dbd0f98e3d4d94f2 100644 (file)
--- a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts
+++ b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts
@@ -81,7 +81,7 @@
                        compatible = "shared-dma-pool";
                        reusable;
                        /* ion_codec_mm max can alloc size 80M*/
-                       size = <0x13400000>;
+                       size = <0x16400000>;
                        alignment = <0x400000>;
                        linux,contiguous-region;
                        alloc-ranges = <0x30000000 0x50000000>;
@@ -148,7 +148,7 @@
                         * 10x4736064=45.2M(0x2e) support 12bit
                         * 10x4074560=40M(0x28) support 10bit
                         */
-                       size = <0x02800000>;
+                       size = <0x05800000>;
                        alignment = <0x400000>;
                };
 
@@ -208,8 +208,8 @@
                status = "okay";
        };
 
-       deinterlace {
-               compatible = "amlogic, deinterlace";
+       multi-di {
+               compatible = "amlogic, dim-g12a";
                status = "okay";
                /* 0:use reserved; 1:use cma; 2:use cma as reserved */
                flag_cma = <1>;
@@ -233,6 +233,30 @@
                pps-enable = <1>;
        };
 
+       deinterlace {
+               compatible = "amlogic, deinterlace";
+               status = "disable";//status = "okay";
+               /* 0:use reserved; 1:use cma; 2:use cma as reserved */
+               flag_cma = <1>;
+               //memory-region = <&di_reserved>;
+               //memory-region = <&di_cma_reserved>;
+               interrupts = <0 46 1
+                               0 40 1>;
+               interrupt-names = "pre_irq", "post_irq";
+               clocks = <&clkc CLKID_VPU_CLKB_TMP_COMP>,
+                       <&clkc CLKID_VPU_CLKB_COMP>;
+               clock-names = "vpu_clkb_tmp_composite",
+                       "vpu_clkb_composite";
+               clock-range = <334 667>;
+               /* buffer-size = <3621952>;(yuv422 8bit) */
+               buffer-size = <4074560>;/*yuv422 fullpack*/
+               /* reserve-iomap = "true"; */
+               /* if enable nr10bit, set nr10bit-support to 1 */
+               post-wr-support = <1>;
+               nr10bit-support = <1>;
+               nrds-enable = <1>;
+               pps-enable = <1>;
+       };
        vout {
                compatible = "amlogic, vout";
                status = "okay";

diff --git a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311_sbr.dts b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311_sbr.dts
index 838d8db4a574b9d894586618cdd2d0a68467b3e0..dc2c1af6ad7995c4e8a9f5d1433028eb3e57274d 100644 (file)
--- a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311_sbr.dts
+++ b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311_sbr.dts
@@ -81,7 +81,7 @@
                        compatible = "shared-dma-pool";
                        reusable;
                        /* ion_codec_mm max can alloc size 80M*/
-                       size = <0x13400000>;
+                       size = <0x16400000>;
                        alignment = <0x400000>;
                        linux,contiguous-region;
                        alloc-ranges = <0x30000000 0x50000000>;
@@ -148,7 +148,7 @@
                         * 10x4736064=45.2M(0x2e) support 12bit
                         * 10x4074560=40M(0x28) support 10bit
                         */
-                       size = <0x02800000>;
+                       size = <0x05800000>;
                        alignment = <0x400000>;
                };
 
@@ -208,8 +208,8 @@
                status = "okay";
        };
 
-       deinterlace {
-               compatible = "amlogic, deinterlace";
+       multi-di {
+               compatible = "amlogic, dim-g12a";
                status = "okay";
                /* 0:use reserved; 1:use cma; 2:use cma as reserved */
                flag_cma = <1>;
@@ -233,6 +233,31 @@
                pps-enable = <1>;
        };
 
+       deinterlace {
+               compatible = "amlogic, deinterlace";
+               status = "disable";//status = "okay";
+               /* 0:use reserved; 1:use cma; 2:use cma as reserved */
+               flag_cma = <1>;
+               //memory-region = <&di_reserved>;
+               //memory-region = <&di_cma_reserved>;
+               interrupts = <0 46 1
+                               0 40 1>;
+               interrupt-names = "pre_irq", "post_irq";
+               clocks = <&clkc CLKID_VPU_CLKB_TMP_COMP>,
+                       <&clkc CLKID_VPU_CLKB_COMP>;
+               clock-names = "vpu_clkb_tmp_composite",
+                       "vpu_clkb_composite";
+               clock-range = <334 667>;
+               /* buffer-size = <3621952>;(yuv422 8bit) */
+               buffer-size = <4074560>;/*yuv422 fullpack*/
+               /* reserve-iomap = "true"; */
+               /* if enable nr10bit, set nr10bit-support to 1 */
+               post-wr-support = <1>;
+               nr10bit-support = <1>;
+               nrds-enable = <1>;
+               pps-enable = <1>;
+       };
+
        vout {
                compatible = "amlogic, vout";
                status = "okay";

diff --git a/arch/arm64/boot/dts/amlogic/mesontm2.dtsi b/arch/arm64/boot/dts/amlogic/mesontm2.dtsi
index aed60331c2a40eb54f1210951a5e80c75e3636b4..a4ce79db47626d808540c67153e89b43dd4cbddd 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/mesontm2.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesontm2.dtsi
@@ -306,6 +306,11 @@
                /* 4: 333.3M    5: 400.0M    6: 500.0M    7: 666.7M */
        };
 
+       meson_uvm{
+               compatible = "amlogic, meson_uvm";
+               status = "okay";
+       };
+
        ethmac: ethernet@ff3f0000 {
                compatible = "amlogic, g12a-eth-dwmac","snps,dwmac";
                reg = <0x0 0xff3f0000 0x0 0x10000
@@ -1554,6 +1559,12 @@
                        "parser_b";
        };
 
+       video_composer {
+               compatible = "amlogic, video_composer";
+               dev_name = "video_composer";
+               status = "okay";
+       };
+
        amvenc_avc{
                compatible = "amlogic, amvenc_avc";
                dev_name = "amvenc_avc";

diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts
index 60cdd7771c9a117d63ed3e9ddbc6b625794e5437..94c31485745482c2f4561b0da6d513896b827cfb 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts
+++ b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts
@@ -79,7 +79,7 @@
                        compatible = "shared-dma-pool";
                        reusable;
                        /* ion_codec_mm max can alloc size 80M*/
-                       size = <0x0 0x13400000>;
+                       size = <0x0 0x16400000>;
                        alignment = <0x0 0x400000>;
                        linux,contiguous-region;
                };
@@ -145,7 +145,7 @@
                         * 10x4736064=45.2M(0x2e) support 12bit
                         * 10x4074560=40M(0x28) support 10bit
                         */
-                       size = <0x0 0x02800000>;
+                       size = <0x0 0x05800000>;
                        alignment = <0x0 0x400000>;
                };
 
@@ -204,8 +204,8 @@
                status = "okay";
        };
 
-       deinterlace {
-               compatible = "amlogic, deinterlace";
+       multi-di {
+               compatible = "amlogic, dim-g12a";
                status = "okay";
                /* 0:use reserved; 1:use cma; 2:use cma as reserved */
                flag_cma = <1>;
@@ -229,6 +229,31 @@
                pps-enable = <1>;
        };
 
+       deinterlace {
+               compatible = "amlogic, deinterlace";
+               status = "disable";//status = "okay";
+               /* 0:use reserved; 1:use cma; 2:use cma as reserved */
+               flag_cma = <1>;
+               //memory-region = <&di_reserved>;
+               //memory-region = <&di_cma_reserved>;
+               interrupts = <0 46 1
+                               0 40 1>;
+               interrupt-names = "pre_irq", "post_irq";
+               clocks = <&clkc CLKID_VPU_CLKB_TMP_COMP>,
+                       <&clkc CLKID_VPU_CLKB_COMP>;
+               clock-names = "vpu_clkb_tmp_composite",
+                       "vpu_clkb_composite";
+               clock-range = <334 667>;
+               /* buffer-size = <3621952>;(yuv422 8bit) */
+               buffer-size = <4074560>;/*yuv422 fullpack*/
+               /* reserve-iomap = "true"; */
+               /* if enable nr10bit, set nr10bit-support to 1 */
+               post-wr-support = <1>;
+               nr10bit-support = <1>;
+               nrds-enable = <1>;
+               pps-enable = <1>;
+       };
+
        vout {
                compatible = "amlogic, vout";
                status = "okay";

diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311_sbr.dts b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311_sbr.dts
index 4a6432b0ab2ad6333b773fc77c045c0c5f077aa1..981578b35a1fcb755b5b260901c61e76550941b5 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311_sbr.dts
+++ b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311_sbr.dts
@@ -79,7 +79,7 @@
                        compatible = "shared-dma-pool";
                        reusable;
                        /* ion_codec_mm max can alloc size 80M*/
-                       size = <0x0 0x13400000>;
+                       size = <0x0 0x16400000>;
                        alignment = <0x0 0x400000>;
                        linux,contiguous-region;
                };
@@ -145,7 +145,7 @@
                         * 10x4736064=45.2M(0x2e) support 12bit
                         * 10x4074560=40M(0x28) support 10bit
                         */
-                       size = <0x0 0x02800000>;
+                       size = <0x0 0x05800000>;
                        alignment = <0x0 0x400000>;
                };
 
@@ -204,8 +204,8 @@
                status = "okay";
        };
 
-       deinterlace {
-               compatible = "amlogic, deinterlace";
+       multi-di {
+               compatible = "amlogic, dim-g12a";
                status = "okay";
                /* 0:use reserved; 1:use cma; 2:use cma as reserved */
                flag_cma = <1>;
@@ -229,6 +229,30 @@
                pps-enable = <1>;
        };
 
+       deinterlace {
+               compatible = "amlogic, deinterlace";
+               status = "disable";//status = "okay";
+               /* 0:use reserved; 1:use cma; 2:use cma as reserved */
+               flag_cma = <1>;
+               //memory-region = <&di_reserved>;
+               //memory-region = <&di_cma_reserved>;
+               interrupts = <0 46 1
+                               0 40 1>;
+               interrupt-names = "pre_irq", "post_irq";
+               clocks = <&clkc CLKID_VPU_CLKB_TMP_COMP>,
+                       <&clkc CLKID_VPU_CLKB_COMP>;
+               clock-names = "vpu_clkb_tmp_composite",
+                       "vpu_clkb_composite";
+               clock-range = <334 667>;
+               /* buffer-size = <3621952>;(yuv422 8bit) */
+               buffer-size = <4074560>;/*yuv422 fullpack*/
+               /* reserve-iomap = "true"; */
+               /* if enable nr10bit, set nr10bit-support to 1 */
+               post-wr-support = <1>;
+               nr10bit-support = <1>;
+               nrds-enable = <1>;
+               pps-enable = <1>;
+       };
        vout {
                compatible = "amlogic, vout";
                status = "okay";