| author | Can Cao <can.cao@amlogic.com> | 2018-07-02 10:50:41 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@droid04> | 2018-07-02 10:50:41 (GMT) |
| commit | 81b1cb075895fe0b089ea34b8c78e767f5c88a2a (patch) | |
| tree | 024f34863fc25280c9dcc3af1ee44a1ce3cc998a | |
| parent | 61aba8820b2f65404a07a812d51028ec5d564473 (diff) | |
| parent | 88ab7c83b8921c7820f8502a1f87763605b72066 (diff) | |
| download | common-81b1cb075895fe0b089ea34b8c78e767f5c88a2a.zip common-81b1cb075895fe0b089ea34b8c78e767f5c88a2a.tar.gz common-81b1cb075895fe0b089ea34b8c78e767f5c88a2a.tar.bz2 | |
Merge "arm64: dts: txlx: add the attestationkeybox of unifykey" into p-amlogic
5 files changed, 35 insertions, 5 deletions
diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts index f35b8ca..e51ad50 100644 --- 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 = <16>; + unifykey-num = <17>; unifykey-index-0 = <&keysn_0>; unifykey-index-1 = <&keysn_1>; unifykey-index-2 = <&keysn_2>; @@ -767,6 +767,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"; @@ -853,6 +854,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_16:key_16{ + key-name = "attestationkeybox";// attestation key + key-device = "secure"; + key-permit = "read","write","del"; + }; }; /* End unifykey */ vdac { diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts index 8189e3c..13bf556 100644 --- a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts @@ -795,7 +795,7 @@ compatible = "amlogic, unifykey"; status = "okay"; - unifykey-num = <16>; + unifykey-num = <17>; unifykey-index-0 = <&keysn_0>; unifykey-index-1 = <&keysn_1>; unifykey-index-2 = <&keysn_2>; @@ -812,6 +812,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"; @@ -898,6 +899,11 @@ key-device = "secure"; key-permit = "read","write","del"; }; + keysn_16:key_16{ + key-name = "attestationkeybox";// attestation key + key-device = "secure"; + key-permit = "read","write","del"; + }; }; /* End unifykey */ vdac { diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts index 43271e5..9749bc3 100644 --- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts +++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts @@ -769,7 +769,7 @@ compatible = "amlogic, unifykey"; status = "okay"; - unifykey-num = <19>; + unifykey-num = <20>; unifykey-index-0 = <&keysn_0>; unifykey-index-1 = <&keysn_1>; unifykey-index-2 = <&keysn_2>; @@ -789,6 +789,7 @@ unifykey-index-16 = <&keysn_16>; unifykey-index-17 = <&keysn_17>; unifykey-index-18 = <&keysn_18>; + unifykey-index-19 = <&keysn_19>; keysn_0: key_0{ key-name = "usid"; @@ -890,6 +891,11 @@ key-device = "normal"; key-permit = "read","write","del"; }; + keysn_19:key_19{ + key-name = "attestationkeybox";// attestation key + key-device = "secure"; + 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 ce0ea4b..4965d09 100644 --- 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 = <19>; + unifykey-num = <20>; unifykey-index-0 = <&keysn_0>; unifykey-index-1 = <&keysn_1>; unifykey-index-2 = <&keysn_2>; @@ -789,6 +789,7 @@ unifykey-index-16 = <&keysn_16>; unifykey-index-17 = <&keysn_17>; unifykey-index-18 = <&keysn_18>; + unifykey-index-19 = <&keysn_19>; keysn_0: key_0{ key-name = "usid"; @@ -890,6 +891,11 @@ key-device = "normal"; key-permit = "read","write","del"; }; + keysn_19:key_19{ + key-name = "attestationkeybox";// attestation key + key-device = "secure"; + key-permit = "read","write","del"; + }; }; /* End unifykey */ vdac { diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts index 3439ef8..1e689dd 100644 --- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts +++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts @@ -768,7 +768,7 @@ compatible = "amlogic, unifykey"; status = "okay"; - unifykey-num = <19>; + unifykey-num = <20>; unifykey-index-0 = <&keysn_0>; unifykey-index-1 = <&keysn_1>; unifykey-index-2 = <&keysn_2>; @@ -788,6 +788,7 @@ unifykey-index-16 = <&keysn_16>; unifykey-index-17 = <&keysn_17>; unifykey-index-18 = <&keysn_18>; + unifykey-index-19 = <&keysn_19>; keysn_0: key_0{ key-name = "usid"; @@ -889,6 +890,11 @@ key-device = "normal"; key-permit = "read","write","del"; }; + keysn_19:key_19{ + key-name = "attestationkeybox";// attestation key + key-device = "secure"; + key-permit = "read","write","del"; + }; }; /* End unifykey */ vdac { |