projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3bf2bf8)
dts:add region_code key[1/2]
authorTing Wang <ting.wang@amlogic.com>
Tue, 10 Jul 2018 09:19:47 +0000 (17:19 +0800)
committerYixun Lan <yixun.lan@amlogic.com>
Fri, 13 Jul 2018 03:04:26 +0000 (20:04 -0700)
PD# 169693

add region_code key to change wifi local

Change-Id: I60b52e82b69128a90fbd9f72f0de8b46ccd04e7e
Signed-off-by: Ting Wang <ting.wang@amlogic.com>
arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts patch | blob | blame | history
arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts patch | blob | blame | history
arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts patch | blob | blame | history
arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts patch | blob | blame | history
arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts patch | blob | blame | history
arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts patch | blob | blame | history
arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts patch | blob | blame | history
arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts patch | blob | blame | history
arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts patch | blob | blame | history
arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts patch | blob | blame | history

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts
index 8e59d401094f0bbefdbd88f5b5202a78fe94924f..7df8213b43e5c07275e5158d0d331fe14a1fbd2e 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts
@@ -303,7 +303,7 @@
        unifykey{
                compatible = "amlogic, unifykey";
                status = "ok";
-               unifykey-num = <15>;
+               unifykey-num = <16>;
                unifykey-index-0 = <&keysn_0>;
                unifykey-index-1 = <&keysn_1>;
                unifykey-index-2 = <&keysn_2>;
@@ -319,6 +319,7 @@
                unifykey-index-12= <&keysn_12>;
                unifykey-index-13= <&keysn_13>;
                unifykey-index-14= <&keysn_14>;
+               unifykey-index-15= <&keysn_15>;
 
                keysn_0: key_0{
                        key-name = "usid";
@@ -398,6 +399,11 @@
                        key-device = "secure";
                        key-permit = "read","write","del";
                };
+               keysn_15:key_15{
+                       key-name = "region_code";
+                       key-device = "normal";
+                       key-permit = "read","write","del";
+               };
        };//End unifykey
 
        efusekey:efusekey{
diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts
index d73bb8a002095bc095f70fb45cbd0c9d5a4930ee..d76282a6a193985d25840bcb01251db74c161ae3 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts
@@ -1087,7 +1087,7 @@
                compatible = "amlogic, unifykey";
                status = "ok";
 
-               unifykey-num = <15>;
+               unifykey-num = <16>;
                unifykey-index-0 = <&keysn_0>;
                unifykey-index-1 = <&keysn_1>;
                unifykey-index-2 = <&keysn_2>;
@@ -1103,6 +1103,7 @@
                unifykey-index-12= <&keysn_12>;
                unifykey-index-13= <&keysn_13>;
                unifykey-index-14= <&keysn_14>;
+               unifykey-index-15= <&keysn_15>;
 
                keysn_0: key_0{
                        key-name = "usid";
@@ -1182,6 +1183,11 @@
                        key-device = "secure";
                        key-permit = "read","write","del";
                };
+               keysn_15:key_15{
+                       key-name = "region_code";
+                       key-device = "normal";
+                       key-permit = "read","write","del";
+               };
        };//End unifykey
 
 };
diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts
index ba687a2aac9477d0cfc171c698b6fd5175e92396..4cfe7e46b5500626195d349f21340087f399b6a1 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts
@@ -1097,7 +1097,7 @@
                compatible = "amlogic, unifykey";
                status = "ok";
 
-               unifykey-num = <15>;
+               unifykey-num = <16>;
                unifykey-index-0 = <&keysn_0>;
                unifykey-index-1 = <&keysn_1>;
                unifykey-index-2 = <&keysn_2>;
@@ -1113,6 +1113,7 @@
                unifykey-index-12= <&keysn_12>;
                unifykey-index-13= <&keysn_13>;
                unifykey-index-14= <&keysn_14>;
+               unifykey-index-15= <&keysn_15>;
 
                keysn_0: key_0{
                        key-name = "usid";
@@ -1192,6 +1193,11 @@
                        key-device = "secure";
                        key-permit = "read","write","del";
                };
+               keysn_15:key_15{
+                       key-name = "region_code";
+                       key-device = "normal";
+                       key-permit = "read","write","del";
+               };
        };//End unifykey
 };
 &efuse {
diff --git a/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts
index 4cd5978ecbd1b7631d34251f9e15be053ae36354..683c69c7b00fd465a9e7d5a893c7bf21af4be055 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts
@@ -1129,7 +1129,7 @@
                compatible = "amlogic, unifykey";
                status = "ok";
 
-               unifykey-num = <15>;
+               unifykey-num = <16>;
                unifykey-index-0 = <&keysn_0>;
                unifykey-index-1 = <&keysn_1>;
                unifykey-index-2 = <&keysn_2>;
@@ -1145,6 +1145,7 @@
                unifykey-index-12= <&keysn_12>;
                unifykey-index-13= <&keysn_13>;
                unifykey-index-14= <&keysn_14>;
+               unifykey-index-15= <&keysn_15>;
 
                keysn_0: key_0{
                        key-name = "usid";
@@ -1224,6 +1225,11 @@
                        key-device = "secure";
                        key-permit = "read","write","del";
                };
+               keysn_15:key_15{
+                       key-name = "region_code";
+                       key-device = "normal";
+                       key-permit = "read","write","del";
+               };
        };//End unifykey
        dvb {
                compatible = "amlogic, dvb";
diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts
index 8cdf896ad358fe7f5859f682c2126251dee39316..81c3805a72fdee0d8e5412ca7cb6700d10e3a2cf 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts
@@ -1150,7 +1150,7 @@
                compatible = "amlogic, unifykey";
                status = "ok";
 
-               unifykey-num = <15>;
+               unifykey-num = <16>;
                unifykey-index-0 = <&keysn_0>;
                unifykey-index-1 = <&keysn_1>;
                unifykey-index-2 = <&keysn_2>;
@@ -1166,6 +1166,7 @@
                unifykey-index-12= <&keysn_12>;
                unifykey-index-13= <&keysn_13>;
                unifykey-index-14= <&keysn_14>;
+               unifykey-index-15= <&keysn_15>;
 
                keysn_0: key_0{
                        key-name = "usid";
@@ -1245,6 +1246,11 @@
                        key-device = "secure";
                        key-permit = "read","write","del";
                };
+               keysn_15:key_15{
+                       key-name = "region_code";
+                       key-device = "normal";
+                       key-permit = "read","write","del";
+               };
        };//End unifykey
 
 };
diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts
index e01aa2d7d1db343e3c1fab73c5cab81baa7c707f..442bb6276c7cb004f5b7e1899fbe854d05bd03c4 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts
@@ -1151,7 +1151,7 @@
                compatible = "amlogic, unifykey";
                status = "ok";
 
-               unifykey-num = <15>;
+               unifykey-num = <16>;
                unifykey-index-0 = <&keysn_0>;
                unifykey-index-1 = <&keysn_1>;
                unifykey-index-2 = <&keysn_2>;
@@ -1167,6 +1167,7 @@
                unifykey-index-12= <&keysn_12>;
                unifykey-index-13= <&keysn_13>;
                unifykey-index-14= <&keysn_14>;
+               unifykey-index-15= <&keysn_15>;
 
                keysn_0: key_0{
                        key-name = "usid";
@@ -1246,6 +1247,11 @@
                        key-device = "secure";
                        key-permit = "read","write","del";
                };
+               keysn_15:key_15{
+                       key-name = "region_code";
+                       key-device = "normal";
+                       key-permit = "read","write","del";
+               };
        };//End unifykey
 
 };
diff --git a/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts b/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts
index 178a2ba985716e4a7ff692ab5d6213e246df6957..a61388c4c131b14172624b3a78315a527e169f28 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts
@@ -1103,7 +1103,7 @@
                compatible = "amlogic, unifykey";
                status = "ok";
 
-               unifykey-num = <15>;
+               unifykey-num = <16>;
                unifykey-index-0 = <&keysn_0>;
                unifykey-index-1 = <&keysn_1>;
                unifykey-index-2 = <&keysn_2>;
@@ -1119,6 +1119,7 @@
                unifykey-index-12= <&keysn_12>;
                unifykey-index-13= <&keysn_13>;
                unifykey-index-14= <&keysn_14>;
+               unifykey-index-15= <&keysn_15>;
 
                keysn_0: key_0{
                        key-name = "usid";
@@ -1198,6 +1199,11 @@
                        key-device = "secure";
                        key-permit = "read","write","del";
                };
+               keysn_15:key_15{
+                       key-name = "region_code";
+                       key-device = "normal";
+                       key-permit = "read","write","del";
+               };
        };//End unifykey
 };
 &efuse {
diff --git a/arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts b/arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts
index 025bb4242fbac077e822a7dbe765d37ff121b50d..fe45760cc81202ea8bb732c019b82eb414e41f85 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts
@@ -1113,7 +1113,7 @@
                compatible = "amlogic, unifykey";
                status = "ok";
 
-               unifykey-num = <15>;
+               unifykey-num = <16>;
                unifykey-index-0 = <&keysn_0>;
                unifykey-index-1 = <&keysn_1>;
                unifykey-index-2 = <&keysn_2>;
@@ -1129,6 +1129,7 @@
                unifykey-index-12= <&keysn_12>;
                unifykey-index-13= <&keysn_13>;
                unifykey-index-14= <&keysn_14>;
+               unifykey-index-15= <&keysn_15>;
 
                keysn_0: key_0{
                        key-name = "usid";
@@ -1208,6 +1209,11 @@
                        key-device = "secure";
                        key-permit = "read","write","del";
                };
+               keysn_15:key_15{
+                       key-name = "region_code";
+                       key-device = "normal";
+                       key-permit = "read","write","del";
+               };
        };//End unifykey
 };
 &efuse {
diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts
index a73e058c161c1a529c9e70c20b9b1d7af9b78321..3d1a6bb07dd2a931ae5e1a68c26cb7d907b9b3c7 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts
@@ -750,7 +750,7 @@
                compatible = "amlogic, unifykey";
                status = "okay";
 
-               unifykey-num = <17>;
+               unifykey-num = <18>;
                unifykey-index-0 = <&keysn_0>;
                unifykey-index-1 = <&keysn_1>;
                unifykey-index-2 = <&keysn_2>;
@@ -768,6 +768,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";
@@ -859,6 +860,11 @@
                        key-device = "secure";
                        key-permit = "read","write","del";
                };
+               keysn_17:key_17{
+                       key-name = "region_code";
+                       key-device = "normal";
+                       key-permit = "read","write","del";
+               };
        }; /* End unifykey */
 
        vdac {
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 4965d09631b419f5504ccb65273c6d75615c54df..71004862fd33fb1edad6c2f0b7cdc5aeb4e12a05 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
@@ -769,7 +769,7 @@
                compatible = "amlogic, unifykey";
                status = "okay";
 
-               unifykey-num = <20>;
+               unifykey-num = <21>;
                unifykey-index-0 = <&keysn_0>;
                unifykey-index-1 = <&keysn_1>;
                unifykey-index-2 = <&keysn_2>;
@@ -790,6 +790,7 @@
                unifykey-index-17 = <&keysn_17>;
                unifykey-index-18 = <&keysn_18>;
                unifykey-index-19 = <&keysn_19>;
+               unifykey-index-20 = <&keysn_20>;
 
                keysn_0: key_0{
                        key-name = "usid";
@@ -896,6 +897,11 @@
                        key-device = "secure";
                        key-permit = "read","write","del";
                };
+               keysn_20:key_20{
+                       key-name = "region_code";
+                       key-device = "normal";
+                       key-permit = "read","write","del";
+               };
        }; /* End unifykey */
 
        vdac {