From 37fb5606f08fecb5d2a44cae6d53b05345a49fa3 Mon Sep 17 00:00:00 2001 From: rongrong zhou Date: Tue, 11 Dec 2018 15:42:46 +0800 Subject: [PATCH] dts: add netflix MGKID unify key [3/3] PD#SWPL-2847 Problem: add netflix MGKID support Solution: add netflix MGKID support Verify: ampere NTS Change-Id: I7bf7f7b7527a36dc7b50f1a98bdb5d0a60af8741 Signed-off-by: rongrong zhou --- arch/arm/boot/dts/amlogic/g12a_s905d2_skt.dts | 8 +++++++- arch/arm/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts | 8 +++++++- arch/arm/boot/dts/amlogic/g12a_s905d2_u200.dts | 8 +++++++- arch/arm/boot/dts/amlogic/g12a_s905d2_u200_1g.dts | 8 +++++++- arch/arm/boot/dts/amlogic/g12a_s905d2_u200_buildroot.dts | 8 +++++++- .../dts/amlogic/g12a_s905d2_u200_buildroot_vccktest.dts | 8 +++++++- .../boot/dts/amlogic/g12a_s905d2_u200_drm_buildroot.dts | 8 +++++++- arch/arm/boot/dts/amlogic/g12a_s905x2_u211.dts | 8 +++++++- arch/arm/boot/dts/amlogic/g12a_s905x2_u211_1g.dts | 8 +++++++- arch/arm/boot/dts/amlogic/g12a_s905x2_u211_512m.dts | 8 +++++++- arch/arm/boot/dts/amlogic/g12a_s905x2_u211_buildroot.dts | 8 +++++++- arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts | 9 +++++++-- arch/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts | 8 +++++++- arch/arm/boot/dts/amlogic/g12a_s905x2_u212_buildroot.dts | 8 +++++++- arch/arm/boot/dts/amlogic/g12a_s905y2_u220.dts | 8 +++++++- arch/arm/boot/dts/amlogic/g12a_s905y2_u221.dts | 8 +++++++- arch/arm/boot/dts/amlogic/g12b_a311d_skt.dts | 9 ++++++++- arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts | 8 +++++++- arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts | 8 +++++++- .../dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts | 8 +++++++- arch/arm/boot/dts/amlogic/gxl_p212_1g.dts | 9 ++++++++- arch/arm/boot/dts/amlogic/gxl_p212_1g_buildroot.dts | 8 +++++++- arch/arm/boot/dts/amlogic/gxl_p212_1g_hd.dts | 8 +++++++- arch/arm/boot/dts/amlogic/gxl_p212_2g.dts | 8 +++++++- arch/arm/boot/dts/amlogic/gxl_p212_2g_buildroot.dts | 8 +++++++- arch/arm/boot/dts/amlogic/gxl_p230_2g.dts | 8 +++++++- arch/arm/boot/dts/amlogic/gxl_p230_2g_buildroot.dts | 8 +++++++- arch/arm/boot/dts/amlogic/gxl_p231_1g.dts | 8 +++++++- arch/arm/boot/dts/amlogic/gxl_p231_2g.dts | 8 +++++++- arch/arm/boot/dts/amlogic/gxl_p231_2g_buildroot.dts | 8 +++++++- arch/arm/boot/dts/amlogic/gxl_p241_1g.dts | 8 +++++++- arch/arm/boot/dts/amlogic/gxl_p241_1g_buildroot.dts | 8 +++++++- arch/arm/boot/dts/amlogic/gxl_p241_v2-1g.dts | 8 +++++++- arch/arm/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts | 8 +++++++- arch/arm/boot/dts/amlogic/gxl_p400_2g.dts | 8 +++++++- arch/arm/boot/dts/amlogic/gxl_p401_2g.dts | 8 +++++++- arch/arm/boot/dts/amlogic/gxl_sei210_1g.dts | 8 +++++++- arch/arm/boot/dts/amlogic/gxl_sei210_2g.dts | 8 +++++++- arch/arm/boot/dts/amlogic/gxl_skt.dts | 8 +++++++- arch/arm/boot/dts/amlogic/gxm_q200_2g.dts | 8 +++++++- arch/arm/boot/dts/amlogic/gxm_q200_2g_buildroot.dts | 8 +++++++- arch/arm/boot/dts/amlogic/gxm_q201_1g.dts | 8 +++++++- arch/arm/boot/dts/amlogic/gxm_q201_2g.dts | 8 +++++++- arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts | 8 +++++++- .../arm64/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts | 8 +++++++- arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts | 8 +++++++- arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_1g.dts | 8 +++++++- .../boot/dts/amlogic/g12a_s905d2_u200_buildroot.dts | 8 +++++++- .../dts/amlogic/g12a_s905d2_u200_buildroot_vccktest.dts | 8 +++++++- .../boot/dts/amlogic/g12a_s905d2_u200_drm_buildroot.dts | 8 +++++++- arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts | 8 +++++++- arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_1g.dts | 8 +++++++- arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_512m.dts | 8 +++++++- .../boot/dts/amlogic/g12a_s905x2_u211_buildroot.dts | 8 +++++++- arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts | 9 +++++++-- arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts | 8 +++++++- .../boot/dts/amlogic/g12a_s905x2_u212_buildroot.dts | 8 +++++++- arch/arm64/boot/dts/amlogic/g12a_s905y2_u220.dts | 8 +++++++- arch/arm64/boot/dts/amlogic/g12a_s905y2_u221.dts | 8 +++++++- arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts | 9 ++++++++- arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts | 8 +++++++- .../arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts | 8 +++++++- .../dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts | 8 +++++++- arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts | 8 +++++++- arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts | 8 +++++++- arch/arm64/boot/dts/amlogic/gxl_p212_1g_hd.dts | 8 +++++++- arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts | 8 +++++++- arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts | 8 +++++++- arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts | 8 +++++++- arch/arm64/boot/dts/amlogic/gxl_p230_2g_buildroot.dts | 8 +++++++- arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts | 8 +++++++- arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts | 8 +++++++- arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts | 8 +++++++- arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts | 8 +++++++- arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts | 8 +++++++- arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts | 8 +++++++- arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts | 8 +++++++- arch/arm64/boot/dts/amlogic/gxl_p400_2g.dts | 8 +++++++- arch/arm64/boot/dts/amlogic/gxl_p401_2g.dts | 8 +++++++- arch/arm64/boot/dts/amlogic/gxl_sei210_1g.dts | 8 +++++++- arch/arm64/boot/dts/amlogic/gxl_sei210_2g.dts | 8 +++++++- arch/arm64/boot/dts/amlogic/gxl_skt.dts | 8 +++++++- arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts | 8 +++++++- arch/arm64/boot/dts/amlogic/gxm_q200_2g_buildroot.dts | 8 +++++++- arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts | 8 +++++++- arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts | 8 +++++++- 86 files changed, 605 insertions(+), 88 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/g12a_s905d2_skt.dts b/arch/arm/boot/dts/amlogic/g12a_s905d2_skt.dts index 7455c5fef5cc..c511bb41f9a4 100644 --- a/arch/arm/boot/dts/amlogic/g12a_s905d2_skt.dts +++ b/arch/arm/boot/dts/amlogic/g12a_s905d2_skt.dts @@ -273,7 +273,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>; @@ -289,6 +289,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"; @@ -368,6 +369,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ diff --git a/arch/arm/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts b/arch/arm/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts index 974dc794e7df..6955c4592030 100644 --- a/arch/arm/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts @@ -260,7 +260,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>; @@ -276,6 +276,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"; @@ -355,6 +356,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ diff --git a/arch/arm/boot/dts/amlogic/g12a_s905d2_u200.dts b/arch/arm/boot/dts/amlogic/g12a_s905d2_u200.dts index 25bf288a47c8..14efeb2cebee 100644 --- a/arch/arm/boot/dts/amlogic/g12a_s905d2_u200.dts +++ b/arch/arm/boot/dts/amlogic/g12a_s905d2_u200.dts @@ -312,7 +312,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>; @@ -329,6 +329,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"; @@ -413,6 +414,11 @@ key-device = "normal"; key-permit = "read","write","del"; }; + keysn_16:key_16{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ 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 75c2b6b690e2..e83075a04a4d 100644 --- a/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_1g.dts +++ b/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_1g.dts @@ -316,7 +316,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>; @@ -333,6 +333,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"; @@ -417,6 +418,11 @@ key-device = "normal"; key-permit = "read","write","del"; }; + keysn_16:key_16{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ diff --git a/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_buildroot.dts b/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_buildroot.dts index ba33e538b1c1..4441fcc9b185 100644 --- a/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_buildroot.dts @@ -383,7 +383,7 @@ unifykey{ compatible = "amlogic, unifykey"; status = "ok"; - unifykey-num = <14>; + unifykey-num = <15>; unifykey-index-0 = <&keysn_0>; unifykey-index-1 = <&keysn_1>; unifykey-index-2 = <&keysn_2>; @@ -398,6 +398,7 @@ unifykey-index-11= <&keysn_11>; unifykey-index-12= <&keysn_12>; unifykey-index-13= <&keysn_13>; + unifykey-index-14= <&keysn_14>; keysn_0: key_0{ key-name = "usid"; @@ -472,6 +473,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_14:key_14{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ diff --git a/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_buildroot_vccktest.dts b/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_buildroot_vccktest.dts index 095565b15e69..a960b7439f0e 100644 --- a/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_buildroot_vccktest.dts +++ b/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_buildroot_vccktest.dts @@ -384,7 +384,7 @@ unifykey{ compatible = "amlogic, unifykey"; status = "ok"; - unifykey-num = <14>; + unifykey-num = <15>; unifykey-index-0 = <&keysn_0>; unifykey-index-1 = <&keysn_1>; unifykey-index-2 = <&keysn_2>; @@ -399,6 +399,7 @@ unifykey-index-11= <&keysn_11>; unifykey-index-12= <&keysn_12>; unifykey-index-13= <&keysn_13>; + unifykey-index-14= <&keysn_14>; keysn_0: key_0{ key-name = "usid"; @@ -473,6 +474,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_14:key_14{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ diff --git a/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_drm_buildroot.dts b/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_drm_buildroot.dts index bf01de1fb0af..f533037eb344 100644 --- a/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_drm_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_drm_buildroot.dts @@ -384,7 +384,7 @@ unifykey{ compatible = "amlogic, unifykey"; status = "ok"; - unifykey-num = <14>; + unifykey-num = <15>; unifykey-index-0 = <&keysn_0>; unifykey-index-1 = <&keysn_1>; unifykey-index-2 = <&keysn_2>; @@ -399,6 +399,7 @@ unifykey-index-11= <&keysn_11>; unifykey-index-12= <&keysn_12>; unifykey-index-13= <&keysn_13>; + unifykey-index-14= <&keysn_14>; keysn_0: key_0{ key-name = "usid"; @@ -473,6 +474,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_14:key_14{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u211.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u211.dts index 8993e669192f..c3e236146c7b 100644 --- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u211.dts +++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u211.dts @@ -318,7 +318,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>; @@ -334,6 +334,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"; @@ -413,6 +414,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_1g.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_1g.dts index 2efdac6f5003..cd970a2bbb0c 100644 --- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_1g.dts +++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_1g.dts @@ -312,7 +312,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>; @@ -328,6 +328,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"; @@ -407,6 +408,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_512m.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_512m.dts index 51c55d543614..231f350a8064 100644 --- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_512m.dts +++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_512m.dts @@ -307,7 +307,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>; @@ -323,6 +323,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"; @@ -402,6 +403,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_buildroot.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_buildroot.dts index d642bfacc49e..a3ae0f1f1cfb 100644 --- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_buildroot.dts @@ -372,7 +372,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>; @@ -388,6 +388,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"; @@ -467,6 +468,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts index cd829f24fa56..e55a93b31e4e 100644 --- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts +++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts @@ -318,7 +318,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>; @@ -334,7 +334,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"; key-device = "normal"; @@ -413,6 +413,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ 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 fffda51eb29a..9a25988db68e 100644 --- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts +++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts @@ -307,7 +307,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>; @@ -323,6 +323,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"; @@ -402,6 +403,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_buildroot.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_buildroot.dts index 3d887bfbf5b0..f3fd8d376006 100644 --- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_buildroot.dts @@ -372,7 +372,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>; @@ -388,6 +388,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"; @@ -467,6 +468,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ diff --git a/arch/arm/boot/dts/amlogic/g12a_s905y2_u220.dts b/arch/arm/boot/dts/amlogic/g12a_s905y2_u220.dts index c57c95fcb134..a734db686b5f 100644 --- a/arch/arm/boot/dts/amlogic/g12a_s905y2_u220.dts +++ b/arch/arm/boot/dts/amlogic/g12a_s905y2_u220.dts @@ -291,7 +291,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>; @@ -307,6 +307,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"; @@ -386,6 +387,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ diff --git a/arch/arm/boot/dts/amlogic/g12a_s905y2_u221.dts b/arch/arm/boot/dts/amlogic/g12a_s905y2_u221.dts index 8818d2291d09..94eed609b05e 100644 --- a/arch/arm/boot/dts/amlogic/g12a_s905y2_u221.dts +++ b/arch/arm/boot/dts/amlogic/g12a_s905y2_u221.dts @@ -259,7 +259,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>; @@ -275,6 +275,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"; @@ -354,6 +355,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_skt.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_skt.dts index cf67d4ffe197..d707eb07f111 100644 --- a/arch/arm/boot/dts/amlogic/g12b_a311d_skt.dts +++ b/arch/arm/boot/dts/amlogic/g12b_a311d_skt.dts @@ -322,7 +322,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>; @@ -338,6 +338,8 @@ 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"; @@ -417,6 +419,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts index e25509f9e1ea..e32bb762807f 100644 --- a/arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts +++ b/arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts @@ -291,7 +291,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>; @@ -307,6 +307,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"; @@ -386,6 +387,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts index ef1b803d1d01..83937103b82e 100644 --- a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts @@ -422,7 +422,7 @@ unifykey{ compatible = "amlogic, unifykey"; status = "ok"; - unifykey-num = <14>; + unifykey-num = <15>; unifykey-index-0 = <&keysn_0>; unifykey-index-1 = <&keysn_1>; unifykey-index-2 = <&keysn_2>; @@ -437,6 +437,7 @@ unifykey-index-11= <&keysn_11>; unifykey-index-12= <&keysn_12>; unifykey-index-13= <&keysn_13>; + unifykey-index-14= <&keysn_14>; keysn_0: key_0{ key-name = "usid"; @@ -511,6 +512,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_14:key_14{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey amlvecm { diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts index 075480d6c67e..b1b2676c8b2b 100644 --- a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts +++ b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts @@ -388,7 +388,7 @@ unifykey{ compatible = "amlogic, unifykey"; status = "ok"; - unifykey-num = <14>; + unifykey-num = <15>; unifykey-index-0 = <&keysn_0>; unifykey-index-1 = <&keysn_1>; unifykey-index-2 = <&keysn_2>; @@ -403,6 +403,7 @@ unifykey-index-11= <&keysn_11>; unifykey-index-12= <&keysn_12>; unifykey-index-13= <&keysn_13>; + unifykey-index-14= <&keysn_14>; keysn_0: key_0{ key-name = "usid"; @@ -477,6 +478,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_14:key_14{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey amlvecm { diff --git a/arch/arm/boot/dts/amlogic/gxl_p212_1g.dts b/arch/arm/boot/dts/amlogic/gxl_p212_1g.dts index fa0728f490f2..52302e0513d4 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p212_1g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p212_1g.dts @@ -1095,7 +1095,7 @@ 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>; @@ -1112,6 +1112,8 @@ 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"; @@ -1196,6 +1198,11 @@ key-device = "normal"; key-permit = "read","write","del"; }; + keysn_16:key_16{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; diff --git a/arch/arm/boot/dts/amlogic/gxl_p212_1g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxl_p212_1g_buildroot.dts index 502aa352728b..bbbfda5986be 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p212_1g_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p212_1g_buildroot.dts @@ -1137,7 +1137,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>; @@ -1153,6 +1153,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"; @@ -1232,6 +1233,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; diff --git a/arch/arm/boot/dts/amlogic/gxl_p212_1g_hd.dts b/arch/arm/boot/dts/amlogic/gxl_p212_1g_hd.dts index b945affd0a62..868fa5d4d2a2 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p212_1g_hd.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p212_1g_hd.dts @@ -1081,7 +1081,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>; @@ -1097,6 +1097,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"; @@ -1176,6 +1177,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; diff --git a/arch/arm/boot/dts/amlogic/gxl_p212_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p212_2g.dts index 356feef5c0f8..1279b513e544 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p212_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p212_2g.dts @@ -1102,7 +1102,7 @@ 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>; @@ -1119,6 +1119,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"; @@ -1203,6 +1204,11 @@ key-device = "normal"; key-permit = "read","write","del"; }; + keysn_16:key_16{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; &efuse { diff --git a/arch/arm/boot/dts/amlogic/gxl_p212_2g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxl_p212_2g_buildroot.dts index 5d1edd4298b2..82f0fd9fee99 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p212_2g_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p212_2g_buildroot.dts @@ -1137,7 +1137,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>; @@ -1153,6 +1153,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"; @@ -1232,6 +1233,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; &efuse { diff --git a/arch/arm/boot/dts/amlogic/gxl_p230_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p230_2g.dts index fde00216163f..c1944cc88ba5 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p230_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p230_2g.dts @@ -1127,7 +1127,7 @@ 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>; @@ -1144,6 +1144,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"; @@ -1228,6 +1229,11 @@ key-device = "normal"; key-permit = "read","write","del"; }; + keysn_16:key_16{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey dvb { compatible = "amlogic, dvb"; diff --git a/arch/arm/boot/dts/amlogic/gxl_p230_2g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxl_p230_2g_buildroot.dts index 2762873ee08b..bdb46750131d 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p230_2g_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p230_2g_buildroot.dts @@ -1188,7 +1188,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>; @@ -1204,6 +1204,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"; @@ -1283,6 +1284,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; &efuse { diff --git a/arch/arm/boot/dts/amlogic/gxl_p231_1g.dts b/arch/arm/boot/dts/amlogic/gxl_p231_1g.dts index 7a95455b9b3e..5fdbc780e00e 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p231_1g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p231_1g.dts @@ -1016,7 +1016,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>; @@ -1032,6 +1032,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"; @@ -1111,6 +1112,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; &efuse { diff --git a/arch/arm/boot/dts/amlogic/gxl_p231_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p231_2g.dts index 15cab9a79f9e..0a35a0dfe4f7 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p231_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p231_2g.dts @@ -1015,7 +1015,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>; @@ -1031,6 +1031,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"; @@ -1110,6 +1111,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; &efuse { diff --git a/arch/arm/boot/dts/amlogic/gxl_p231_2g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxl_p231_2g_buildroot.dts index 3765c4d27f4b..2365af310a9a 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p231_2g_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p231_2g_buildroot.dts @@ -1084,7 +1084,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>; @@ -1100,6 +1100,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"; @@ -1179,6 +1180,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; &efuse { diff --git a/arch/arm/boot/dts/amlogic/gxl_p241_1g.dts b/arch/arm/boot/dts/amlogic/gxl_p241_1g.dts index 32b7b7def651..feab09e7e205 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p241_1g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p241_1g.dts @@ -1166,7 +1166,7 @@ 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>; @@ -1183,6 +1183,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"; @@ -1267,6 +1268,11 @@ key-device = "normal"; key-permit = "read","write","del"; }; + keysn_16:key_16{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; diff --git a/arch/arm/boot/dts/amlogic/gxl_p241_1g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxl_p241_1g_buildroot.dts index 7d494d28c003..af46fd2edaec 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p241_1g_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p241_1g_buildroot.dts @@ -1224,7 +1224,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>; @@ -1240,6 +1240,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"; @@ -1319,6 +1320,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; diff --git a/arch/arm/boot/dts/amlogic/gxl_p241_v2-1g.dts b/arch/arm/boot/dts/amlogic/gxl_p241_v2-1g.dts index cb79f871765c..aa85f76b0ef2 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p241_v2-1g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p241_v2-1g.dts @@ -1166,7 +1166,7 @@ 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>; @@ -1183,6 +1183,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"; @@ -1267,6 +1268,11 @@ key-device = "normal"; key-permit = "read","write","del"; }; + keysn_16:key_16{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; diff --git a/arch/arm/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts index f65c85878ebb..bd8fa63f3cc1 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts @@ -1223,7 +1223,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>; @@ -1239,6 +1239,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"; @@ -1318,6 +1319,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; diff --git a/arch/arm/boot/dts/amlogic/gxl_p400_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p400_2g.dts index 70b70d7a2e73..46a4b3276009 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p400_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p400_2g.dts @@ -743,7 +743,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>; @@ -759,6 +759,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"; @@ -838,6 +839,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; diff --git a/arch/arm/boot/dts/amlogic/gxl_p401_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p401_2g.dts index 95a4060cea5c..2bb9708797db 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p401_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p401_2g.dts @@ -831,7 +831,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>; @@ -847,6 +847,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"; @@ -926,6 +927,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; diff --git a/arch/arm/boot/dts/amlogic/gxl_sei210_1g.dts b/arch/arm/boot/dts/amlogic/gxl_sei210_1g.dts index 2c77572a9bb2..2f447c3deff0 100644 --- a/arch/arm/boot/dts/amlogic/gxl_sei210_1g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_sei210_1g.dts @@ -1075,7 +1075,7 @@ 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>; @@ -1092,6 +1092,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"; @@ -1176,6 +1177,11 @@ key-device = "normal"; key-permit = "read","write","del"; }; + keysn_16:key_16{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; diff --git a/arch/arm/boot/dts/amlogic/gxl_sei210_2g.dts b/arch/arm/boot/dts/amlogic/gxl_sei210_2g.dts index 1d6ccece2364..f68747e8b572 100644 --- a/arch/arm/boot/dts/amlogic/gxl_sei210_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_sei210_2g.dts @@ -1085,7 +1085,7 @@ 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>; @@ -1102,6 +1102,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"; @@ -1186,6 +1187,11 @@ key-device = "normal"; key-permit = "read","write","del"; }; + keysn_16:key_16{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; &efuse { diff --git a/arch/arm/boot/dts/amlogic/gxl_skt.dts b/arch/arm/boot/dts/amlogic/gxl_skt.dts index 240ea538b9c9..5ace41afcb84 100644 --- a/arch/arm/boot/dts/amlogic/gxl_skt.dts +++ b/arch/arm/boot/dts/amlogic/gxl_skt.dts @@ -1081,7 +1081,7 @@ 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>; @@ -1098,6 +1098,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"; @@ -1182,6 +1183,11 @@ key-device = "normal"; key-permit = "read","write","del"; }; + keysn_16:key_16{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; diff --git a/arch/arm/boot/dts/amlogic/gxm_q200_2g.dts b/arch/arm/boot/dts/amlogic/gxm_q200_2g.dts index 3edfef142dc1..722771f0e370 100644 --- a/arch/arm/boot/dts/amlogic/gxm_q200_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxm_q200_2g.dts @@ -1110,7 +1110,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>; @@ -1126,6 +1126,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"; @@ -1205,6 +1206,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; &efuse { diff --git a/arch/arm/boot/dts/amlogic/gxm_q200_2g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxm_q200_2g_buildroot.dts index 74e160f4cd5e..e695359c349b 100644 --- a/arch/arm/boot/dts/amlogic/gxm_q200_2g_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/gxm_q200_2g_buildroot.dts @@ -1182,7 +1182,7 @@ compatible = "amlogic, unifykey"; status = "ok"; - unifykey-num = <14>; + unifykey-num = <15>; unifykey-index-0 = <&keysn_0>; unifykey-index-1 = <&keysn_1>; unifykey-index-2 = <&keysn_2>; @@ -1197,6 +1197,7 @@ unifykey-index-11= <&keysn_11>; unifykey-index-12= <&keysn_12>; unifykey-index-13= <&keysn_13>; + unifykey-index-14= <&keysn_14>; keysn_0: key_0{ key-name = "usid"; @@ -1271,6 +1272,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_14:key_14{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; &efuse { diff --git a/arch/arm/boot/dts/amlogic/gxm_q201_1g.dts b/arch/arm/boot/dts/amlogic/gxm_q201_1g.dts index a4cbc4f243b9..c1ac3945fdd6 100644 --- a/arch/arm/boot/dts/amlogic/gxm_q201_1g.dts +++ b/arch/arm/boot/dts/amlogic/gxm_q201_1g.dts @@ -1112,7 +1112,7 @@ 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>; @@ -1129,6 +1129,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"; @@ -1213,6 +1214,11 @@ key-device = "normal"; key-permit = "read","write","del"; }; + keysn_16:key_16{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; &efuse { diff --git a/arch/arm/boot/dts/amlogic/gxm_q201_2g.dts b/arch/arm/boot/dts/amlogic/gxm_q201_2g.dts index 4fde48750149..b70073f2e5c6 100644 --- a/arch/arm/boot/dts/amlogic/gxm_q201_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxm_q201_2g.dts @@ -1115,7 +1115,7 @@ 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>; @@ -1132,6 +1132,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"; @@ -1216,6 +1217,11 @@ key-device = "normal"; key-permit = "read","write","del"; }; + keysn_16:key_16{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; &efuse { diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts index 8c5f322146d4..5700547f0188 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts @@ -273,7 +273,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>; @@ -289,6 +289,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"; @@ -368,6 +369,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts index 903f012fdc01..5c48f26ba772 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts @@ -260,7 +260,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>; @@ -276,6 +276,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"; @@ -355,6 +356,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts index e09642ac639c..4ece6dae6907 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts @@ -310,7 +310,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>; @@ -327,6 +327,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"; @@ -411,6 +412,11 @@ key-device = "normal"; key-permit = "read","write","del"; }; + keysn_16:key_16{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ 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 04793a9a8e66..fdcd550c82ce 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_1g.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_1g.dts @@ -310,7 +310,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>; @@ -327,6 +327,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"; @@ -411,6 +412,11 @@ key-device = "normal"; key-permit = "read","write","del"; }; + keysn_16:key_16{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_buildroot.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_buildroot.dts index 8eb77e66a063..1b5bb0f0155b 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_buildroot.dts @@ -383,7 +383,7 @@ unifykey{ compatible = "amlogic, unifykey"; status = "ok"; - unifykey-num = <14>; + unifykey-num = <15>; unifykey-index-0 = <&keysn_0>; unifykey-index-1 = <&keysn_1>; unifykey-index-2 = <&keysn_2>; @@ -398,6 +398,7 @@ unifykey-index-11= <&keysn_11>; unifykey-index-12= <&keysn_12>; unifykey-index-13= <&keysn_13>; + unifykey-index-14= <&keysn_14>; keysn_0: key_0{ key-name = "usid"; @@ -472,6 +473,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_14:key_14{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_buildroot_vccktest.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_buildroot_vccktest.dts index 9d00434ca30d..bbbbb344343b 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_buildroot_vccktest.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_buildroot_vccktest.dts @@ -384,7 +384,7 @@ unifykey{ compatible = "amlogic, unifykey"; status = "ok"; - unifykey-num = <14>; + unifykey-num = <15>; unifykey-index-0 = <&keysn_0>; unifykey-index-1 = <&keysn_1>; unifykey-index-2 = <&keysn_2>; @@ -399,6 +399,7 @@ unifykey-index-11= <&keysn_11>; unifykey-index-12= <&keysn_12>; unifykey-index-13= <&keysn_13>; + unifykey-index-14= <&keysn_14>; keysn_0: key_0{ key-name = "usid"; @@ -473,6 +474,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_14:key_14{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_drm_buildroot.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_drm_buildroot.dts index 3c0e783c0d27..927ef1bb2e29 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_drm_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_drm_buildroot.dts @@ -384,7 +384,7 @@ unifykey{ compatible = "amlogic, unifykey"; status = "ok"; - unifykey-num = <14>; + unifykey-num = <15>; unifykey-index-0 = <&keysn_0>; unifykey-index-1 = <&keysn_1>; unifykey-index-2 = <&keysn_2>; @@ -399,6 +399,7 @@ unifykey-index-11= <&keysn_11>; unifykey-index-12= <&keysn_12>; unifykey-index-13= <&keysn_13>; + unifykey-index-14= <&keysn_14>; keysn_0: key_0{ key-name = "usid"; @@ -473,6 +474,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_14:key_14{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts index 55167efb68b6..d45f54b86f3d 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts @@ -318,7 +318,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>; @@ -334,6 +334,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"; @@ -413,6 +414,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_1g.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_1g.dts index e54f4475d983..c463f06ac21a 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_1g.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_1g.dts @@ -312,7 +312,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>; @@ -328,6 +328,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"; @@ -407,6 +408,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_512m.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_512m.dts index e9b6cd324e76..88edd7a1e77a 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_512m.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_512m.dts @@ -307,7 +307,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>; @@ -323,6 +323,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"; @@ -402,6 +403,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_buildroot.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_buildroot.dts index b75dc70437e8..c2ac3e54fafe 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_buildroot.dts @@ -372,7 +372,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>; @@ -388,6 +388,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"; @@ -467,6 +468,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts index 6c8c40448e4d..4d19d6e2d0f1 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts @@ -318,7 +318,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>; @@ -334,7 +334,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"; key-device = "normal"; @@ -413,6 +413,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ 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 0ddaf89c0f31..77efdd7256a4 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.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 = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_buildroot.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_buildroot.dts index d7eec8d349f6..0d3a73079a8e 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_buildroot.dts @@ -372,7 +372,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>; @@ -388,6 +388,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"; @@ -467,6 +468,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905y2_u220.dts b/arch/arm64/boot/dts/amlogic/g12a_s905y2_u220.dts index 0928ca4f5f8a..1af01b2b46d7 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905y2_u220.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905y2_u220.dts @@ -291,7 +291,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>; @@ -307,6 +307,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"; @@ -386,6 +387,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905y2_u221.dts b/arch/arm64/boot/dts/amlogic/g12a_s905y2_u221.dts index 479a8b576577..e016086d9d80 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905y2_u221.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905y2_u221.dts @@ -257,7 +257,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>; @@ -273,6 +273,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"; @@ -352,6 +353,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts index ae70a65a28f5..fa545c35feed 100644 --- a/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts +++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts @@ -322,7 +322,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>; @@ -338,6 +338,8 @@ 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"; @@ -417,6 +419,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts index 011d5a42fa4b..56217de805a1 100644 --- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts +++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts @@ -292,7 +292,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>; @@ -308,6 +308,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"; @@ -387,6 +388,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey efusekey:efusekey{ diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts index 0581fa119dd2..5d81dd3c4217 100644 --- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts @@ -422,7 +422,7 @@ unifykey{ compatible = "amlogic, unifykey"; status = "ok"; - unifykey-num = <14>; + unifykey-num = <15>; unifykey-index-0 = <&keysn_0>; unifykey-index-1 = <&keysn_1>; unifykey-index-2 = <&keysn_2>; @@ -437,6 +437,7 @@ unifykey-index-11= <&keysn_11>; unifykey-index-12= <&keysn_12>; unifykey-index-13= <&keysn_13>; + unifykey-index-14= <&keysn_14>; keysn_0: key_0{ key-name = "usid"; @@ -511,6 +512,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_14:key_14{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey amlvecm { diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts index dfecbc7e47d0..6a304e48ccf0 100644 --- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts +++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts @@ -388,7 +388,7 @@ unifykey{ compatible = "amlogic, unifykey"; status = "ok"; - unifykey-num = <14>; + unifykey-num = <15>; unifykey-index-0 = <&keysn_0>; unifykey-index-1 = <&keysn_1>; unifykey-index-2 = <&keysn_2>; @@ -403,6 +403,7 @@ unifykey-index-11= <&keysn_11>; unifykey-index-12= <&keysn_12>; unifykey-index-13= <&keysn_13>; + unifykey-index-14= <&keysn_14>; keysn_0: key_0{ key-name = "usid"; @@ -477,6 +478,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_14:key_14{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey amlvecm { diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts index 581a4e7cf668..b771abce1f82 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts @@ -1091,7 +1091,7 @@ 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>; @@ -1108,6 +1108,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"; @@ -1192,6 +1193,11 @@ key-device = "normal"; key-permit = "read","write","del"; }; + keysn_16:key_16{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts index af4354c9f8b2..9bea9ee3d0af 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts @@ -1136,7 +1136,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>; @@ -1152,6 +1152,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"; @@ -1231,6 +1232,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_1g_hd.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_1g_hd.dts index 756275df18ae..85f64e4ca09b 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p212_1g_hd.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p212_1g_hd.dts @@ -1080,7 +1080,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>; @@ -1096,6 +1096,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"; @@ -1175,6 +1176,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + 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 ee7b6bf64fff..6ec798b6cdef 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts @@ -1100,7 +1100,7 @@ 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>; @@ -1117,6 +1117,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"; @@ -1201,6 +1202,11 @@ key-device = "normal"; key-permit = "read","write","del"; }; + keysn_16:key_16{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; &efuse { diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts index 2a1f93b7b425..ac0032136d9e 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts @@ -1137,7 +1137,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>; @@ -1153,6 +1153,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"; @@ -1232,6 +1233,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + 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 d3bff2aca6d6..101ad78b2091 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts @@ -1125,7 +1125,7 @@ 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>; @@ -1142,6 +1142,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"; @@ -1226,6 +1227,11 @@ key-device = "normal"; key-permit = "read","write","del"; }; + keysn_16:key_16{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey dvb { compatible = "amlogic, dvb"; diff --git a/arch/arm64/boot/dts/amlogic/gxl_p230_2g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p230_2g_buildroot.dts index d68329648181..5c38487443f2 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p230_2g_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p230_2g_buildroot.dts @@ -1188,7 +1188,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>; @@ -1204,6 +1204,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"; @@ -1283,6 +1284,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey dvb { compatible = "amlogic, dvb"; diff --git a/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts index 16fd2294d8a4..7d8d55ab43b9 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts @@ -1015,7 +1015,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>; @@ -1031,6 +1031,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"; @@ -1110,6 +1111,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; &efuse { diff --git a/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts index 18bd9d26b34b..ba85a853779d 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts @@ -1015,7 +1015,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>; @@ -1031,6 +1031,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"; @@ -1110,6 +1111,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; &efuse { diff --git a/arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts index 5cfdf96c4142..92f6e7d9ceef 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts @@ -1084,7 +1084,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>; @@ -1100,6 +1100,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"; @@ -1179,6 +1180,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; &efuse { diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts index 3484cfa16541..dadb59aed48a 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts @@ -1162,7 +1162,7 @@ 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>; @@ -1179,6 +1179,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"; @@ -1263,6 +1264,11 @@ key-device = "normal"; key-permit = "read","write","del"; }; + keysn_16:key_16{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts index 01f333a3a692..2a7245aff17a 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts @@ -1223,7 +1223,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>; @@ -1239,6 +1239,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"; @@ -1318,6 +1319,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + 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 b96331146c44..f569d0799fc5 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts @@ -1163,7 +1163,7 @@ 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>; @@ -1180,6 +1180,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"; @@ -1264,6 +1265,11 @@ key-device = "normal"; key-permit = "read","write","del"; }; + keysn_16:key_16{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts index 3950d2cf44dc..6bfe499fead6 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts @@ -1222,7 +1222,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>; @@ -1238,6 +1238,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"; @@ -1317,6 +1318,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; diff --git a/arch/arm64/boot/dts/amlogic/gxl_p400_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p400_2g.dts index 7ba7ce2b46f0..bb6cc479e20c 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p400_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p400_2g.dts @@ -743,7 +743,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>; @@ -759,6 +759,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"; @@ -838,6 +839,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; diff --git a/arch/arm64/boot/dts/amlogic/gxl_p401_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p401_2g.dts index 56cc4cb7daef..f316571920da 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p401_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p401_2g.dts @@ -831,7 +831,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>; @@ -847,6 +847,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"; @@ -926,6 +927,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; diff --git a/arch/arm64/boot/dts/amlogic/gxl_sei210_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_sei210_1g.dts index d7b19b7709fe..916f139309e5 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_sei210_1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_sei210_1g.dts @@ -1074,7 +1074,7 @@ 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>; @@ -1091,6 +1091,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"; @@ -1175,6 +1176,11 @@ key-device = "normal"; key-permit = "read","write","del"; }; + keysn_16:key_16{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; diff --git a/arch/arm64/boot/dts/amlogic/gxl_sei210_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_sei210_2g.dts index c6ec955ee017..5140780d2f7f 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_sei210_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_sei210_2g.dts @@ -1085,7 +1085,7 @@ 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>; @@ -1102,6 +1102,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"; @@ -1186,6 +1187,11 @@ key-device = "normal"; key-permit = "read","write","del"; }; + keysn_16:key_16{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; &efuse { diff --git a/arch/arm64/boot/dts/amlogic/gxl_skt.dts b/arch/arm64/boot/dts/amlogic/gxl_skt.dts index 330175a84188..b78105139352 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_skt.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_skt.dts @@ -1080,7 +1080,7 @@ 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>; @@ -1097,6 +1097,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"; @@ -1181,6 +1182,11 @@ key-device = "normal"; key-permit = "read","write","del"; }; + keysn_16:key_16{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; diff --git a/arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts b/arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts index 7565a65248e5..d3bc6cd8c294 100644 --- a/arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts @@ -1110,7 +1110,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>; @@ -1126,6 +1126,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"; @@ -1205,6 +1206,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_15:key_15{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; &efuse { diff --git a/arch/arm64/boot/dts/amlogic/gxm_q200_2g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxm_q200_2g_buildroot.dts index f677d012ea80..e8dcafa47c2e 100644 --- a/arch/arm64/boot/dts/amlogic/gxm_q200_2g_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/gxm_q200_2g_buildroot.dts @@ -1182,7 +1182,7 @@ compatible = "amlogic, unifykey"; status = "ok"; - unifykey-num = <14>; + unifykey-num = <15>; unifykey-index-0 = <&keysn_0>; unifykey-index-1 = <&keysn_1>; unifykey-index-2 = <&keysn_2>; @@ -1197,6 +1197,7 @@ unifykey-index-11= <&keysn_11>; unifykey-index-12= <&keysn_12>; unifykey-index-13= <&keysn_13>; + unifykey-index-14= <&keysn_14>; keysn_0: key_0{ key-name = "usid"; @@ -1271,6 +1272,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_14:key_14{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; &efuse { diff --git a/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts b/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts index 8cf545afa6c1..a9043e836c4c 100644 --- a/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts @@ -1112,7 +1112,7 @@ 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>; @@ -1129,6 +1129,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"; @@ -1213,6 +1214,11 @@ key-device = "normal"; key-permit = "read","write","del"; }; + keysn_16:key_16{ + key-name = "netflix_mgkid"; + key-device = "secure"; + 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 fc6e409e03d4..0b9e93620866 100644 --- a/arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts @@ -1115,7 +1115,7 @@ 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>; @@ -1132,6 +1132,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"; @@ -1216,6 +1217,11 @@ key-device = "normal"; key-permit = "read","write","del"; }; + keysn_16:key_16{ + key-name = "netflix_mgkid"; + key-device = "secure"; + key-permit = "read","write","del"; + }; };//End unifykey }; &efuse {