From e1e1b5a84c8ca6c633ed571253cc8e514c3687e8 Mon Sep 17 00:00:00 2001 From: Zhongfu Luo Date: Fri, 23 Nov 2018 11:34:33 +0800 Subject: [PATCH] dts: TXL: defendkey: support secure upgrade check [1/1] PD#SWPL-2343 Problem: TXL need to support secure upgrade check Solution: add defendkey support in all TXL dts Verify: TXL skt board verify pass Change-Id: Idb81fa1f1b5a27e5c44dc961ceef94f1edfc06d9 Signed-off-by: Zhongfu Luo --- arch/arm/boot/dts/amlogic/mesontxl.dtsi | 7 +++++++ arch/arm/boot/dts/amlogic/txl_t950_p341.dts | 10 ++++++++++ arch/arm/boot/dts/amlogic/txl_t960_p346.dts | 10 ++++++++++ arch/arm/boot/dts/amlogic/txl_t962_p320.dts | 10 ++++++++++ arch/arm/boot/dts/amlogic/txl_t962_p321.dts | 11 +++++++++++ arch/arm/boot/dts/amlogic/txl_t962_p321_720p.dts | 10 ++++++++++ arch/arm64/boot/dts/amlogic/mesontxl.dtsi | 7 +++++++ arch/arm64/boot/dts/amlogic/txl_t950_p341.dts | 10 ++++++++++ arch/arm64/boot/dts/amlogic/txl_t960_p346.dts | 10 ++++++++++ arch/arm64/boot/dts/amlogic/txl_t962_p320.dts | 10 ++++++++++ arch/arm64/boot/dts/amlogic/txl_t962_p321.dts | 11 +++++++++++ arch/arm64/boot/dts/amlogic/txl_t962_p321_720p.dts | 11 +++++++++++ 12 files changed, 117 insertions(+) diff --git a/arch/arm/boot/dts/amlogic/mesontxl.dtsi b/arch/arm/boot/dts/amlogic/mesontxl.dtsi index cda5e02..1fb4036 100644 --- a/arch/arm/boot/dts/amlogic/mesontxl.dtsi +++ b/arch/arm/boot/dts/amlogic/mesontxl.dtsi @@ -1062,6 +1062,13 @@ compatible = "amlogic, vdac-txl"; status = "okay"; }; + + defendkey: defendkey { + compatible = "amlogic, defendkey"; + reg = <0xc8834500 0x4>; /*RNG_USR_DATA*/ + mem_size = <0x0 0x100000>; + status = "disabled"; + }; }; /* end of / */ &gpu{ diff --git a/arch/arm/boot/dts/amlogic/txl_t950_p341.dts b/arch/arm/boot/dts/amlogic/txl_t950_p341.dts index 438c355..9149d26 100644 --- a/arch/arm/boot/dts/amlogic/txl_t950_p341.dts +++ b/arch/arm/boot/dts/amlogic/txl_t950_p341.dts @@ -169,6 +169,11 @@ size = <0x04000000>; alignment = <0x400000>; }; + + defendkey_reserved:linux,defendkey { + compatible = "amlogic, defendkey"; + reg = <0x08300000 0x100000>; + }; }; /* end of reserved-memory */ secmon { @@ -1125,3 +1130,8 @@ status = "okay"; }; +&defendkey { + memory-region = <&defendkey_reserved>; + status = "okay"; +}; + diff --git a/arch/arm/boot/dts/amlogic/txl_t960_p346.dts b/arch/arm/boot/dts/amlogic/txl_t960_p346.dts index 356ac2f..645bd09 100644 --- a/arch/arm/boot/dts/amlogic/txl_t960_p346.dts +++ b/arch/arm/boot/dts/amlogic/txl_t960_p346.dts @@ -169,6 +169,11 @@ size = <0x04000000>; alignment = <0x400000>; }; + + defendkey_reserved:linux,defendkey { + compatible = "amlogic, defendkey"; + reg = <0x08300000 0x100000>; + }; }; /* end of reserved-memory */ secmon { @@ -1132,3 +1137,8 @@ status = "okay"; }; +&defendkey { + memory-region = <&defendkey_reserved>; + status = "okay"; +}; + diff --git a/arch/arm/boot/dts/amlogic/txl_t962_p320.dts b/arch/arm/boot/dts/amlogic/txl_t962_p320.dts index 39a9c8d..a127a588 100644 --- a/arch/arm/boot/dts/amlogic/txl_t962_p320.dts +++ b/arch/arm/boot/dts/amlogic/txl_t962_p320.dts @@ -159,6 +159,11 @@ size = <0x04000000>; alignment = <0x400000>; }; + + defendkey_reserved:linux,defendkey { + compatible = "amlogic, defendkey"; + reg = <0x08300000 0x100000>; + }; }; /* end of reserved-memory */ secmon { @@ -1141,3 +1146,8 @@ status = "okay"; }; +&defendkey { + memory-region = <&defendkey_reserved>; + status = "okay"; +}; + diff --git a/arch/arm/boot/dts/amlogic/txl_t962_p321.dts b/arch/arm/boot/dts/amlogic/txl_t962_p321.dts index 4bdf240..fe056d1 100644 --- a/arch/arm/boot/dts/amlogic/txl_t962_p321.dts +++ b/arch/arm/boot/dts/amlogic/txl_t962_p321.dts @@ -155,6 +155,11 @@ /** alloc by self **/ alloc-ranges = <0x00000000 0x30000000>; }; + + defendkey_reserved:linux,defendkey { + compatible = "amlogic, defendkey"; + reg = <0x08300000 0x100000>; + }; }; /* end of reserved-memory */ dummy-battery { @@ -1174,3 +1179,9 @@ pinctrl-0 = <&spicc_pins>; cs-gpios = <&gpio GPIOZ_3 0>; }; + +&defendkey { + memory-region = <&defendkey_reserved>; + status = "okay"; +}; + diff --git a/arch/arm/boot/dts/amlogic/txl_t962_p321_720p.dts b/arch/arm/boot/dts/amlogic/txl_t962_p321_720p.dts index e71d7eb..4e4a61f 100644 --- a/arch/arm/boot/dts/amlogic/txl_t962_p321_720p.dts +++ b/arch/arm/boot/dts/amlogic/txl_t962_p321_720p.dts @@ -155,6 +155,11 @@ /** alloc by self **/ alloc-ranges = <0x0 0x30000000>; }; + + defendkey_reserved:linux,defendkey { + compatible = "amlogic, defendkey"; + reg = <0x08300000 0x100000>; + }; }; /* end of reserved-memory */ dummy-battery { @@ -1175,3 +1180,8 @@ cs-gpios = <&gpio GPIOZ_3 0>; }; +&defendkey { + memory-region = <&defendkey_reserved>; + status = "okay"; +}; + diff --git a/arch/arm64/boot/dts/amlogic/mesontxl.dtsi b/arch/arm64/boot/dts/amlogic/mesontxl.dtsi index ffc50a27..fcce1f7 100644 --- a/arch/arm64/boot/dts/amlogic/mesontxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesontxl.dtsi @@ -1062,6 +1062,13 @@ compatible = "amlogic, vdac-txl"; status = "okay"; }; + + defendkey: defendkey { + compatible = "amlogic, defendkey"; + reg = <0x0 0xc8834500 0x0 0x4>; /*RNG_USR_DATA*/ + mem_size = <0x0 0x100000>; + status = "disabled"; + }; }; /* end of / */ &gpu{ diff --git a/arch/arm64/boot/dts/amlogic/txl_t950_p341.dts b/arch/arm64/boot/dts/amlogic/txl_t950_p341.dts index 33e4c28..e2d26f9 100644 --- a/arch/arm64/boot/dts/amlogic/txl_t950_p341.dts +++ b/arch/arm64/boot/dts/amlogic/txl_t950_p341.dts @@ -168,6 +168,11 @@ size = <0x0 0x04000000>; alignment = <0x0 0x400000>; }; + + defendkey_reserved:linux,defendkey { + compatible = "amlogic, defendkey"; + reg = <0x0 0x08300000 0x0 0x100000>; + }; }; /* end of reserved-memory */ secmon { @@ -1125,3 +1130,8 @@ status = "okay"; }; +&defendkey { + memory-region = <&defendkey_reserved>; + status = "okay"; +}; + diff --git a/arch/arm64/boot/dts/amlogic/txl_t960_p346.dts b/arch/arm64/boot/dts/amlogic/txl_t960_p346.dts index fa832cc..05f37ad 100644 --- a/arch/arm64/boot/dts/amlogic/txl_t960_p346.dts +++ b/arch/arm64/boot/dts/amlogic/txl_t960_p346.dts @@ -168,6 +168,11 @@ size = <0x0 0x04000000>; alignment = <0x0 0x400000>; }; + + defendkey_reserved:linux,defendkey { + compatible = "amlogic, defendkey"; + reg = <0x0 0x08300000 0x0 0x100000>; + }; }; /* end of reserved-memory */ secmon { @@ -1131,3 +1136,8 @@ status = "okay"; }; +&defendkey { + memory-region = <&defendkey_reserved>; + status = "okay"; +}; + diff --git a/arch/arm64/boot/dts/amlogic/txl_t962_p320.dts b/arch/arm64/boot/dts/amlogic/txl_t962_p320.dts index 48b6360..2fa72b2 100644 --- a/arch/arm64/boot/dts/amlogic/txl_t962_p320.dts +++ b/arch/arm64/boot/dts/amlogic/txl_t962_p320.dts @@ -159,6 +159,11 @@ size = <0x0 0x04000000>; alignment = <0x0 0x400000>; }; + + defendkey_reserved:linux,defendkey { + compatible = "amlogic, defendkey"; + reg = <0x0 0x08300000 0x0 0x100000>; + }; }; /* end of reserved-memory */ secmon { @@ -1141,3 +1146,8 @@ status = "okay"; }; +&defendkey { + memory-region = <&defendkey_reserved>; + status = "okay"; +}; + diff --git a/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts b/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts index 8af1f38..38aad4b 100644 --- a/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts +++ b/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts @@ -147,6 +147,11 @@ size = <0x0 0x01000000>; alignment = <0x0 0x400000>; }; + + defendkey_reserved:linux,defendkey { + compatible = "amlogic, defendkey"; + reg = <0x0 0x08300000 0x0 0x100000>; + }; }; /* end of reserved-memory */ dummy-battery { @@ -1166,3 +1171,9 @@ pinctrl-0 = <&spicc_pins>; cs-gpios = <&gpio GPIOZ_3 0>; }; + +&defendkey { + memory-region = <&defendkey_reserved>; + status = "okay"; +}; + diff --git a/arch/arm64/boot/dts/amlogic/txl_t962_p321_720p.dts b/arch/arm64/boot/dts/amlogic/txl_t962_p321_720p.dts index 9aa8c11..edbe306 100644 --- a/arch/arm64/boot/dts/amlogic/txl_t962_p321_720p.dts +++ b/arch/arm64/boot/dts/amlogic/txl_t962_p321_720p.dts @@ -147,6 +147,11 @@ size = <0x0 0x01000000>; alignment = <0x0 0x400000>; }; + + defendkey_reserved:linux,defendkey { + compatible = "amlogic, defendkey"; + reg = <0x0 0x08300000 0x0 0x100000>; + }; }; /* end of reserved-memory */ dummy-battery { @@ -1166,3 +1171,9 @@ pinctrl-0 = <&spicc_pins>; cs-gpios = <&gpio GPIOZ_3 0>; }; + +&defendkey { + memory-region = <&defendkey_reserved>; + status = "okay"; +}; + -- 2.7.4