dts: mbox add video11 and video12 for screencontrol [1/2]

PD#SWPL-13022

Problem:
mbox needs to support screencontrol

Solution:
add video11 and video12 node

Verify:
SM1-AC202

Change-Id: I1197fceb6cdc2d220318bbd87281b55dff98a665
Signed-off-by: huijie.huang <huijie.huang@amlogic.com>

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905d2_u200.dts b/arch/arm/boot/dts/amlogic/g12a_s905d2_u200.dts
index 27784b9e064ed35f46f5a76bcad0249c557e539f..772665613b8c21dfb05be359e69d62c251036293 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12a_s905d2_u200.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905d2_u200.dts
@@ -303,6 +303,23 @@
                dev_name = "ionvideo";
                status = "okay";
        };
+
+       amlvideo2_0 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <0>;
+               cma_mode = <1>;
+       };
+
+       amlvideo2_1 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <1>;
+               cma_mode = <1>;
+       };
+
        vm0 {
                compatible = "amlogic, vm";
                memory-region = <&vm0_cma_reserved>;

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_1g.dts b/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_1g.dts
index decad3d7b22e46c392a923f541186f902132e735..4949ac10fb2e92724be3507a091b54f623ab01b7 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_1g.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_1g.dts
@@ -307,6 +307,23 @@
                dev_name = "ionvideo";
                status = "okay";
        };
+
+       amlvideo2_0 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <0>;
+               cma_mode = <1>;
+       };
+
+       amlvideo2_1 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <1>;
+               cma_mode = <1>;
+       };
+
        vm0 {
                compatible = "amlogic, vm";
                memory-region = <&vm0_cma_reserved>;

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905d2_u202.dts b/arch/arm/boot/dts/amlogic/g12a_s905d2_u202.dts
index be1dddeb7929780041f171d6e8fd9e82c424d60f..6ad45802d284ad19c0c64d6efe2afeef57ef1494 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12a_s905d2_u202.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905d2_u202.dts
@@ -303,6 +303,23 @@
                dev_name = "ionvideo";
                status = "okay";
        };
+
+       amlvideo2_0 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <0>;
+               cma_mode = <1>;
+       };
+
+       amlvideo2_1 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <1>;
+               cma_mode = <1>;
+       };
+
        vm0 {
                compatible = "amlogic, vm";
                memory-region = <&vm0_cma_reserved>;

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905d2_u202_1g.dts b/arch/arm/boot/dts/amlogic/g12a_s905d2_u202_1g.dts
index 57f59780e775432a91c69388fed329b1b7658ed7..3cefadaeac8ed6b611cc4f3561a03650b42407f9 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12a_s905d2_u202_1g.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905d2_u202_1g.dts
@@ -307,6 +307,23 @@
                dev_name = "ionvideo";
                status = "okay";
        };
+
+       amlvideo2_0 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <0>;
+               cma_mode = <1>;
+       };
+
+       amlvideo2_1 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <1>;
+               cma_mode = <1>;
+       };
+
        vm0 {
                compatible = "amlogic, vm";
                memory-region = <&vm0_cma_reserved>;

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts
index 37530fbeb913b4443bc8d33fb225ad20ca01ce20..2bc08aa058fea5a013e48e1c2db5047987d653a0 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts
@@ -318,6 +318,23 @@
                dev_name = "ionvideo";
                status = "okay";
        };
+
+       amlvideo2_0 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <0>;
+               cma_mode = <1>;
+       };
+
+       amlvideo2_1 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <1>;
+               cma_mode = <1>;
+       };
+
        dvb {
                compatible = "amlogic, dvb";
                dev_name = "dvb";

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
index 8036f65a98a2ab6698b5df08532f645c0aa2242e..4107a6fe29e40479a46d7154a7ff5d49376c242d 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
@@ -316,6 +316,23 @@
                dev_name = "ionvideo";
                status = "okay";
        };
+
+       amlvideo2_0 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <0>;
+               cma_mode = <1>;
+       };
+
+       amlvideo2_1 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <1>;
+               cma_mode = <1>;
+       };
+
        dvb {
                compatible = "amlogic, dvb";
                dev_name = "dvb";

diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts
index 6e66c96a31ed1d6af33fb2f21d79f80ebf0f2d34..7c7ed36b75b53499a6deef73e2cd542bb7791762 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts
+++ b/arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts
@@ -317,6 +317,22 @@
                status = "okay";
        };
 
+       amlvideo2_0 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <0>;
+               cma_mode = <1>;
+       };
+
+       amlvideo2_1 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <1>;
+               cma_mode = <1>;
+       };
+
        gpio_keypad {
                compatible = "amlogic, gpio_keypad";
                status = "okay";

diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts
index 2d7652871d87c3dfddaed387352891373cdf7d84..cf61f5f5e24c59752651bff6324b1d341e64db35 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts
+++ b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts
@@ -317,6 +317,22 @@
                status = "okay";
        };
 
+       amlvideo2_0 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <0>;
+               cma_mode = <1>;
+       };
+
+       amlvideo2_1 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <1>;
+               cma_mode = <1>;
+       };
+
        gpio_keypad {
                compatible = "amlogic, gpio_keypad";
                status = "okay";

diff --git a/arch/arm/boot/dts/amlogic/mesong12a.dtsi b/arch/arm/boot/dts/amlogic/mesong12a.dtsi
index 47b5d2f22e21c6bf419316bf4acebccd460850ae..90d46b0b2f1167ce3375db5aa1c9ef191161ee66 100644 (file)
--- a/arch/arm/boot/dts/amlogic/mesong12a.dtsi
+++ b/arch/arm/boot/dts/amlogic/mesong12a.dtsi
@@ -1199,7 +1199,7 @@
                compatible = "amlogic, ge2d-g12a";
                dev_name = "ge2d";
                status = "okay";
-               interrupts = <0 146 1>;
+               interrupts = <0 150 1>;
                interrupt-names = "ge2d";
                clocks = <&clkc CLKID_VAPB_MUX>,
                        <&clkc CLKID_G2D>,

diff --git a/arch/arm/boot/dts/amlogic/mesong12b.dtsi b/arch/arm/boot/dts/amlogic/mesong12b.dtsi
index f98a97f69b1021864f9e18f91ab47915b7af1179..bfe4966b947e473a544ff0f4baaa4f3be21310c8 100644 (file)
--- a/arch/arm/boot/dts/amlogic/mesong12b.dtsi
+++ b/arch/arm/boot/dts/amlogic/mesong12b.dtsi
@@ -1307,7 +1307,7 @@
                compatible = "amlogic, ge2d-g12a";
                dev_name = "ge2d";
                status = "okay";
-               interrupts = <0 146 1>;
+               interrupts = <0 150 1>;
                interrupt-names = "ge2d";
                clocks = <&clkc CLKID_VAPB_MUX>,
                        <&clkc CLKID_G2D>,

diff --git a/arch/arm/boot/dts/amlogic/mesong12b_a.dtsi b/arch/arm/boot/dts/amlogic/mesong12b_a.dtsi
index 76dd3cd1fee4c971fd79c9b93cad93bc7b898fa0..bf083e8822a4e209edd00d20f901bd5a48e9637a 100644 (file)
--- a/arch/arm/boot/dts/amlogic/mesong12b_a.dtsi
+++ b/arch/arm/boot/dts/amlogic/mesong12b_a.dtsi
@@ -1252,7 +1252,7 @@
                compatible = "amlogic, ge2d-g12a";
                dev_name = "ge2d";
                status = "okay";
-               interrupts = <0 146 1>;
+               interrupts = <0 150 1>;
                interrupt-names = "ge2d";
                clocks = <&clkc CLKID_VAPB_MUX>,
                        <&clkc CLKID_G2D>,

diff --git a/arch/arm/boot/dts/amlogic/mesonsm1.dtsi b/arch/arm/boot/dts/amlogic/mesonsm1.dtsi
index 16ba4a2173d9b5be993ad3918c308b77fc1ed55f..3670fb11d3fe88bc83f75db290064dab40ee4ffe 100644 (file)
--- a/arch/arm/boot/dts/amlogic/mesonsm1.dtsi
+++ b/arch/arm/boot/dts/amlogic/mesonsm1.dtsi
@@ -1218,7 +1218,7 @@
                compatible = "amlogic, ge2d-sm1";
                dev_name = "ge2d";
                status = "okay";
-               interrupts = <0 146 1>;
+               interrupts = <0 150 1>;
                interrupt-names = "ge2d";
                clocks = <&clkc CLKID_VAPB_MUX>,
                        <&clkc CLKID_G2D>,

diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts
index 4a82f62dd68c54cbc0140f3ba952cacf7c46386e..65b9c7bfd3d9eb2d5d849a9b29f815a8cba41897 100644 (file)
--- a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts
@@ -306,6 +306,23 @@
                dev_name = "ionvideo";
                status = "okay";
        };
+
+       amlvideo2_0 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <0>;
+               cma_mode = <1>;
+       };
+
+       amlvideo2_1 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <1>;
+               cma_mode = <1>;
+       };
+
        vm0 {
                compatible = "amlogic, vm";
                memory-region = <&vm0_cma_reserved>;

diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts
index 08c47b723cda16fbfe096732f872e1be1d0cc425..87612e726b01bea27ad208ca672f09299f95464d 100644 (file)
--- a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts
@@ -306,6 +306,23 @@
                dev_name = "ionvideo";
                status = "okay";
        };
+
+       amlvideo2_0 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <0>;
+               cma_mode = <1>;
+       };
+
+       amlvideo2_1 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <1>;
+               cma_mode = <1>;
+       };
+
        vm0 {
                compatible = "amlogic, vm";
                memory-region = <&vm0_cma_reserved>;

diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts
index 51824c007e296266db2326ab444e7fbf18e822bf..3a1d62a14a48beed60e5558fd437a2b8b216c9ff 100644 (file)
--- a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts
@@ -306,6 +306,23 @@
                dev_name = "ionvideo";
                status = "okay";
        };
+
+       amlvideo2_0 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <0>;
+               cma_mode = <1>;
+       };
+
+       amlvideo2_1 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <1>;
+               cma_mode = <1>;
+       };
+
        vm0 {
                compatible = "amlogic, vm";
                memory-region = <&vm0_cma_reserved>;

diff --git a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts
index db56d2494a2c758ec539510edb9e3993240f9795..ab3752a2ad006910905e66da551770cfe8ba9c7f 100644 (file)
--- a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts
@@ -332,6 +332,23 @@
                dev_name = "ionvideo";
                status = "okay";
        };
+
+       amlvideo2_0 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <0>;
+               cma_mode = <1>;
+       };
+
+       amlvideo2_1 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <1>;
+               cma_mode = <1>;
+       };
+
        dvb {
                compatible = "amlogic, dvb";
                dev_name = "dvb";

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts
index 07639e6dd256f0151a9331c3cdf1b788f2a0b67c..b42c4cb1f8e407a1815a2fc9ca40dd9bcbba1517 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts
@@ -302,6 +302,23 @@
                dev_name = "ionvideo";
                status = "okay";
        };
+
+       amlvideo2_0 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <0>;
+               cma_mode = <1>;
+       };
+
+       amlvideo2_1 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <1>;
+               cma_mode = <1>;
+       };
+
        vm0 {
                compatible = "amlogic, vm";
                memory-region = <&vm0_cma_reserved>;

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_1g.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_1g.dts
index 21f3dd8a58c0356bb7a108c1900b0bb1e618c6d7..4fc9d9dfea33a8dd45df4bd305cb20e1ad597671 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_1g.dts
@@ -301,6 +301,23 @@
                dev_name = "ionvideo";
                status = "okay";
        };
+
+       amlvideo2_0 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <0>;
+               cma_mode = <1>;
+       };
+
+       amlvideo2_1 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <1>;
+               cma_mode = <1>;
+       };
+
        vm0 {
                compatible = "amlogic, vm";
                memory-region = <&vm0_cma_reserved>;

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u202.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u202.dts
index b78d4b083bf08ba9a9ab5bf3928ee37de9e996ac..dc7d6d555584941cbd7f3d375c7adc5d8136a4a4 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u202.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u202.dts
@@ -302,6 +302,23 @@
                dev_name = "ionvideo";
                status = "okay";
        };
+
+       amlvideo2_0 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <0>;
+               cma_mode = <1>;
+       };
+
+       amlvideo2_1 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <1>;
+               cma_mode = <1>;
+       };
+
        vm0 {
                compatible = "amlogic, vm";
                memory-region = <&vm0_cma_reserved>;

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u202_1g.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u202_1g.dts
index 4a2ad2b28b3d825cbc7ba89064ba2d1356e7db4a..a3e5d7c4fa9fb4ef31b6b1310cc018533186962b 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u202_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u202_1g.dts
@@ -301,6 +301,23 @@
                dev_name = "ionvideo";
                status = "okay";
        };
+
+       amlvideo2_0 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <0>;
+               cma_mode = <1>;
+       };
+
+       amlvideo2_1 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <1>;
+               cma_mode = <1>;
+       };
+
        vm0 {
                compatible = "amlogic, vm";
                memory-region = <&vm0_cma_reserved>;

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts
index 44c6714a1127f7a59571a4cb2c7cd9188e17e42f..12fc478470ef11025c5eccb5ebe37a4bf3c8dddb 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts
@@ -318,6 +318,23 @@
                dev_name = "ionvideo";
                status = "okay";
        };
+
+       amlvideo2_0 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <0>;
+               cma_mode = <1>;
+       };
+
+       amlvideo2_1 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <1>;
+               cma_mode = <1>;
+       };
+
        /*dvb {
         *      compatible = "amlogic, dvb";
         *      dev_name = "dvb";

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
index f607a00361384e2709ef2741b2765e1ee5abf460..58426c0ef89ebe9ea423e657e90368944ddb0955 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
@@ -312,6 +312,23 @@
                dev_name = "ionvideo";
                status = "okay";
        };
+
+       amlvideo2_0 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <0>;
+               cma_mode = <1>;
+       };
+
+       amlvideo2_1 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <1>;
+               cma_mode = <1>;
+       };
+
        /*dvb {
         *      compatible = "amlogic, dvb";
         *      dev_name = "dvb";

diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts
index d25bea808048d97c6452afb41c215b3fdc8682e9..d1e936c997a3d602a91b020bda6acd91f26d2192 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts
@@ -318,6 +318,22 @@
                status = "okay";
        };
 
+       amlvideo2_0 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <0>;
+               cma_mode = <1>;
+       };
+
+       amlvideo2_1 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <1>;
+               cma_mode = <1>;
+       };
+
        gpio_keypad {
                compatible = "amlogic, gpio_keypad";
                status = "okay";

diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts
index 0751d3dd7dacab65821e2ebb2e54108291f96fbc..a5e16bf004dd083151517bd55a178f3524b5e739 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts
@@ -318,6 +318,22 @@
                status = "okay";
        };
 
+       amlvideo2_0 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <0>;
+               cma_mode = <1>;
+       };
+
+       amlvideo2_1 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <1>;
+               cma_mode = <1>;
+       };
+
        gpio_keypad {
                compatible = "amlogic, gpio_keypad";
                status = "okay";

diff --git a/arch/arm64/boot/dts/amlogic/mesong12a.dtsi b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi
index 0bf23d3b22bbb2916a66a166031b300c582552a3..f0a87c7f9943a40b53a4b6fdcde3c143d75a94c1 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/mesong12a.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi
@@ -1198,7 +1198,7 @@
                compatible = "amlogic, ge2d-g12a";
                dev_name = "ge2d";
                status = "okay";
-               interrupts = <0 146 1>;
+               interrupts = <0 150 1>;
                interrupt-names = "ge2d";
                clocks = <&clkc CLKID_VAPB_MUX>,
                        <&clkc CLKID_G2D>,

diff --git a/arch/arm64/boot/dts/amlogic/mesong12b.dtsi b/arch/arm64/boot/dts/amlogic/mesong12b.dtsi
index 78cfb2829a30659349180568f7ce0ffb56e96885..e213c2f06308b72ba2c999a6f42e2087a451edab 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/mesong12b.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesong12b.dtsi
@@ -1307,7 +1307,7 @@
                compatible = "amlogic, ge2d-g12a";
                dev_name = "ge2d";
                status = "okay";
-               interrupts = <0 146 1>;
+               interrupts = <0 150 1>;
                interrupt-names = "ge2d";
                clocks = <&clkc CLKID_VAPB_MUX>,
                        <&clkc CLKID_G2D>,

diff --git a/arch/arm64/boot/dts/amlogic/mesong12b_a.dtsi b/arch/arm64/boot/dts/amlogic/mesong12b_a.dtsi
index e9276e21c81bdb97c8c7c4d9c066bbcde5a5961b..dec863b2c3ba2e9aedb3945d26b938d68b7347e4 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/mesong12b_a.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesong12b_a.dtsi
@@ -1252,7 +1252,7 @@
                compatible = "amlogic, ge2d-g12a";
                dev_name = "ge2d";
                status = "okay";
-               interrupts = <0 146 1>;
+               interrupts = <0 150 1>;
                interrupt-names = "ge2d";
                clocks = <&clkc CLKID_VAPB_MUX>,
                        <&clkc CLKID_G2D>,

diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts
index eac08706f69f0323345e5a7831c2e3d2ad648af4..8e5251af6e9407d3eb7181509adaabf44a472dcd 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts
@@ -304,6 +304,23 @@
                dev_name = "ionvideo";
                status = "okay";
        };
+
+       amlvideo2_0 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <0>;
+               cma_mode = <1>;
+       };
+
+       amlvideo2_1 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <1>;
+               cma_mode = <1>;
+       };
+
        vm0 {
                compatible = "amlogic, vm";
                memory-region = <&vm0_cma_reserved>;

diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts
index 23386a62a7e2f7f552914e0834358ccf2df04f35..593c2016757168659a64d426b2897f47ccacc084 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts
@@ -304,6 +304,23 @@
                dev_name = "ionvideo";
                status = "okay";
        };
+
+       amlvideo2_0 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <0>;
+               cma_mode = <1>;
+       };
+
+       amlvideo2_1 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <1>;
+               cma_mode = <1>;
+       };
+
        vm0 {
                compatible = "amlogic, vm";
                memory-region = <&vm0_cma_reserved>;

diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts
index 03ab4d29eb9c45727109bf9161251ab2479bb5b0..250033c46884c2dcf4ea005c8150820bd8577a12 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts
@@ -304,6 +304,23 @@
                dev_name = "ionvideo";
                status = "okay";
        };
+
+       amlvideo2_0 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <0>;
+               cma_mode = <1>;
+       };
+
+       amlvideo2_1 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <1>;
+               cma_mode = <1>;
+       };
+
        vm0 {
                compatible = "amlogic, vm";
                memory-region = <&vm0_cma_reserved>;

diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts
index e18fb73c10e9c6234a47c98a082f00c188dc5286..fdb83a7edad1daa596ad0f9a74628ebea6c5edd5 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts
@@ -366,6 +366,23 @@
                dev_name = "ionvideo";
                status = "okay";
        };
+
+       amlvideo2_0 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <0>;
+               cma_mode = <1>;
+       };
+
+       amlvideo2_1 {
+               compatible = "amlogic, amlvideo2";
+               dev_name = "amlvideo2";
+               status = "okay";
+               amlvideo2_id = <1>;
+               cma_mode = <1>;
+       };
+
        vm0 {
                compatible = "amlogic, vm";
                memory-region = <&vm0_cma_reserved>;