newton: sync ac214 to ac213 [2/2]

PD#SWPL-15139

Problem:
sync ac214 to ac213

Solution:
1. SWPL-10130 add a unifykey for google prop ro.oem.key1
2. SWPL-12424 run hs400 200M on sm1
3. SWPL-13393 increase i2c3 clock frequency to 300k
4. SWPL-13022 mbox add video11 and video12 for screencontrol
5. SWPL-10924 irblaster: sm1: enable irblaster for cts

Verify:
newton

Change-Id: Ia43a950b0a3ad356307ec3cc4088c34a3f0f5617
Signed-off-by: Xindong Xu <xindong.xu@amlogic.com>

diff --git a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac214.dts b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac214.dts
index ed4c461e4ed626b06d6e3920fb03270e6b98f4f7..a2a3715f01de0b5a530c0a6a94f075b021bf4648 100644 (file)
--- a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac214.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac214.dts
@@ -18,7 +18,7 @@
 /dts-v1/;
 
 #include "mesonsm1.dtsi"
-#include "partition_mbox_normal.dtsi"
+#include "partition_mbox_normal_dynamic.dtsi"
 #include "mesonsm1_skt-panel.dtsi"
 
 / {
@@ -333,6 +333,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>;
+       };
+
        dvb {
                compatible = "amlogic, dvb";
                dev_name = "dvb";
@@ -376,7 +392,7 @@
        unifykey{
                compatible = "amlogic, unifykey";
                status = "ok";
-               unifykey-num = <16>;
+               unifykey-num = <17>;
                unifykey-index-0 = <&keysn_0>;
                unifykey-index-1 = <&keysn_1>;
                unifykey-index-2 = <&keysn_2>;
@@ -393,6 +409,7 @@
                unifykey-index-13= <&keysn_13>;
                unifykey-index-14= <&keysn_14>;
                unifykey-index-15= <&keysn_15>;
+               unifykey-index-16= <&keysn_16>;
                keysn_0: key_0{
                        key-name = "usid";
                        key-device = "normal";
@@ -476,6 +493,11 @@
                        key-device = "secure";
                        key-permit = "read","write","del";
                };
+               keysn_16:key_16{
+                       key-name = "oemkey";
+                       key-device = "normal";
+                       key-permit = "read","write","del";
+               };
        };//End unifykey
 
        efusekey:efusekey{
@@ -1071,7 +1093,7 @@
        status = "ok";
        pinctrl-names="default";
        pinctrl-0=<&i2c3_master_pins2>;
-       clock-frequency = <100000>; /* default 100k */
+       clock-frequency = <300000>; /* default 100k */
 
        /* for ref board */
        ad82584f_62: ad82584f_62@62 {
@@ -1686,7 +1708,7 @@
                         "MMC_CAP_DRIVER_TYPE_D";
                caps2 = "MMC_CAP2_HS200", "MMC_CAP2_HS400";
                f_min = <400000>;
-               f_max = <166666666>;
+               f_max = <200000000>;
        };
 };
 
@@ -1815,3 +1837,7 @@
                };
        };
 };
+
+&irblaster {
+       status = "okay";
+};

diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac214.dts b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac214.dts
index e8a90ac6e8bccb6d87f0a33d6acb59c0e3403a99..0b351c54ac6aa8c146ad796d426192909d8af6f1 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac214.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac214.dts
@@ -18,7 +18,7 @@
 /dts-v1/;
 
 #include "mesonsm1.dtsi"
-#include "partition_mbox_normal.dtsi"
+#include "partition_mbox_normal_dynamic.dtsi"
 #include "mesonsm1_skt-panel.dtsi"
 
 / {
@@ -371,6 +371,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>;
@@ -434,7 +451,7 @@
        unifykey{
                compatible = "amlogic, unifykey";
                status = "ok";
-               unifykey-num = <17>;
+               unifykey-num = <18>;
                unifykey-index-0 = <&keysn_0>;
                unifykey-index-1 = <&keysn_1>;
                unifykey-index-2 = <&keysn_2>;
@@ -452,6 +469,7 @@
                unifykey-index-14= <&keysn_14>;
                unifykey-index-15= <&keysn_15>;
                unifykey-index-16= <&keysn_16>;
+               unifykey-index-17= <&keysn_17>;
 
                keysn_0: key_0{
                        key-name = "usid";
@@ -541,6 +559,11 @@
                        key-device = "secure";
                        key-permit = "read","write","del";
                };
+               keysn_17:key_17{
+                       key-name = "oemkey";
+                       key-device = "normal";
+                       key-permit = "read","write","del";
+               };
        };//End unifykey
 
        efusekey:efusekey{
@@ -1136,7 +1159,7 @@
        status = "ok";
        pinctrl-names="default";
        pinctrl-0=<&i2c3_master_pins2>;
-       clock-frequency = <100000>; /* default 100k */
+       clock-frequency = <300000>; /* default 100k */
 
        /* for ref board */
        ad82584f_62: ad82584f_62@62 {
@@ -1746,7 +1769,7 @@
                         "MMC_CAP_DRIVER_TYPE_D";
                caps2 = "MMC_CAP2_HS200", "MMC_CAP2_HS400";
                f_min = <400000>;
-               f_max = <166666666>;
+               f_max = <200000000>;
        };
 };
 
@@ -1875,3 +1898,7 @@
                };
        };
 };
+
+&irblaster {
+       status = "okay";
+};