From c8179ddf523c40834a5ad8874e09e63307d33dd9 Mon Sep 17 00:00:00 2001 From: Zhongfu Luo Date: Thu, 13 Dec 2018 17:06:23 +0800 Subject: [PATCH] dts: GXL: defendkey: modify reserve memory mode [2/2] PD#SWPL-2100 Problem: GXL need to modify reserve memory mode Solution: remove defendkey reserved memory in GXL dts Verify: GXL skt board verify pass Change-Id: Ie5ed01c6dd8f88c5594d6bc73f13282e535071a2 Signed-off-by: Zhongfu Luo --- arch/arm/boot/dts/amlogic/gxl_p212_1g.dts | 11 ----------- arch/arm/boot/dts/amlogic/gxl_p212_1g_buildroot.dts | 11 ----------- arch/arm/boot/dts/amlogic/gxl_p212_1g_hd.dts | 11 ----------- arch/arm/boot/dts/amlogic/gxl_p212_2g.dts | 11 ----------- arch/arm/boot/dts/amlogic/gxl_p212_2g_buildroot.dts | 11 ----------- arch/arm/boot/dts/amlogic/gxl_p230_2g.dts | 11 ----------- arch/arm/boot/dts/amlogic/gxl_p230_2g_buildroot.dts | 10 ---------- arch/arm/boot/dts/amlogic/gxl_p231_1g.dts | 11 ----------- arch/arm/boot/dts/amlogic/gxl_p231_2g.dts | 11 ----------- arch/arm/boot/dts/amlogic/gxl_p231_2g_buildroot.dts | 11 ----------- arch/arm/boot/dts/amlogic/gxl_p241_1g.dts | 11 ----------- arch/arm/boot/dts/amlogic/gxl_p241_1g_buildroot.dts | 11 ----------- arch/arm/boot/dts/amlogic/gxl_p241_v2-1g.dts | 11 ----------- .../arm/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts | 11 ----------- arch/arm/boot/dts/amlogic/gxl_p400_2g.dts | 11 ----------- arch/arm/boot/dts/amlogic/gxl_p401_2g.dts | 11 ----------- arch/arm/boot/dts/amlogic/gxl_sei210_1g.dts | 11 ----------- arch/arm/boot/dts/amlogic/gxl_sei210_2g.dts | 11 ----------- arch/arm/boot/dts/amlogic/gxl_skt.dts | 11 ----------- arch/arm/boot/dts/amlogic/mesongxl.dtsi | 2 +- arch/arm/boot/dts/amlogic/mesongxl_sei210.dtsi | 2 +- arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts | 11 ----------- arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts | 11 ----------- arch/arm64/boot/dts/amlogic/gxl_p212_1g_hd.dts | 11 ----------- arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts | 11 ----------- arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts | 11 ----------- arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts | 11 ----------- arch/arm64/boot/dts/amlogic/gxl_p230_2g_buildroot.dts | 10 ---------- arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts | 11 ----------- arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts | 11 ----------- arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts | 11 ----------- arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts | 11 ----------- arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts | 11 ----------- arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts | 11 ----------- .../boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts | 11 ----------- arch/arm64/boot/dts/amlogic/gxl_p400_2g.dts | 11 ----------- arch/arm64/boot/dts/amlogic/gxl_p401_2g.dts | 11 ----------- arch/arm64/boot/dts/amlogic/gxl_sei210_1g.dts | 11 ----------- arch/arm64/boot/dts/amlogic/gxl_sei210_2g.dts | 11 ----------- arch/arm64/boot/dts/amlogic/gxl_skt.dts | 11 ----------- arch/arm64/boot/dts/amlogic/mesongxl.dtsi | 2 +- arch/arm64/boot/dts/amlogic/mesongxl_sei210.dtsi | 2 +- 42 files changed, 4 insertions(+), 420 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/gxl_p212_1g.dts b/arch/arm/boot/dts/amlogic/gxl_p212_1g.dts index 1fccd6039973..fa0728f490f2 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p212_1g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p212_1g.dts @@ -50,12 +50,6 @@ #size-cells = <1>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; - secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; reusable; @@ -1232,8 +1226,3 @@ ssctl = <0>; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - 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 0902289d7b30..502aa352728b 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p212_1g_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p212_1g_buildroot.dts @@ -48,12 +48,6 @@ #size-cells = <1>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; - secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; reusable; @@ -1268,8 +1262,3 @@ ssctl = <0>; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - 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 532a4452a0f8..b945affd0a62 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p212_1g_hd.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p212_1g_hd.dts @@ -50,12 +50,6 @@ #size-cells = <1>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; - secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; reusable; @@ -1212,8 +1206,3 @@ ssctl = <0>; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - diff --git a/arch/arm/boot/dts/amlogic/gxl_p212_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p212_2g.dts index 7148ddaa7084..356feef5c0f8 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p212_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p212_2g.dts @@ -51,12 +51,6 @@ #size-cells = <1>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; - ramoops@0x07400000 { compatible = "ramoops"; reg = <0x07400000 0x00100000>; @@ -1223,8 +1217,3 @@ status = "okay"; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - 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 9f4881cf03d2..5d1edd4298b2 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p212_2g_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p212_2g_buildroot.dts @@ -50,12 +50,6 @@ #size-cells = <1>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; - secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; reusable; @@ -1252,8 +1246,3 @@ status = "okay"; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - diff --git a/arch/arm/boot/dts/amlogic/gxl_p230_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p230_2g.dts index 066537e4a868..fde00216163f 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p230_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p230_2g.dts @@ -51,12 +51,6 @@ #size-cells = <1>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; - ramoops@0x07400000 { compatible = "ramoops"; reg = <0x07400000 0x00100000>; @@ -1356,8 +1350,3 @@ }; }; /* end of pinctrl_periphs */ -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - 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 88a97753a7f2..2762873ee08b 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p230_2g_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p230_2g_buildroot.dts @@ -51,12 +51,6 @@ #size-cells = <1>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; - ramoops@0x07400000 { compatible = "ramoops"; reg = <0x07400000 0x00100000>; @@ -1323,7 +1317,3 @@ }; }; /* end of pinctrl_periphs */ -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; diff --git a/arch/arm/boot/dts/amlogic/gxl_p231_1g.dts b/arch/arm/boot/dts/amlogic/gxl_p231_1g.dts index 0a767281a80e..7a95455b9b3e 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p231_1g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p231_1g.dts @@ -51,12 +51,6 @@ #size-cells = <1>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; - ramoops@0x07400000 { compatible = "ramoops"; reg = <0x07400000 0x00100000>; @@ -1127,8 +1121,3 @@ status = "okay"; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - diff --git a/arch/arm/boot/dts/amlogic/gxl_p231_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p231_2g.dts index 77459846f3fd..15cab9a79f9e 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p231_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p231_2g.dts @@ -51,12 +51,6 @@ #size-cells = <1>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; - ramoops@0x07400000 { compatible = "ramoops"; reg = <0x07400000 0x00100000>; @@ -1126,8 +1120,3 @@ status = "okay"; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - 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 4a6531173a88..3765c4d27f4b 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p231_2g_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p231_2g_buildroot.dts @@ -48,12 +48,6 @@ #size-cells = <1>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; - ramoops@0x07400000 { compatible = "ramoops"; reg = <0x07400000 0x00100000>; @@ -1195,8 +1189,3 @@ status = "okay"; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - diff --git a/arch/arm/boot/dts/amlogic/gxl_p241_1g.dts b/arch/arm/boot/dts/amlogic/gxl_p241_1g.dts index c2e857cabf98..231cbd3ce661 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p241_1g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p241_1g.dts @@ -50,12 +50,6 @@ #size-cells = <1>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; - ramoops@0x07400000 { compatible = "ramoops"; reg = <0x07400000 0x00100000>; @@ -1310,8 +1304,3 @@ ssctl = <0>; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - 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 f173e1e1e245..7d494d28c003 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p241_1g_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p241_1g_buildroot.dts @@ -50,12 +50,6 @@ #size-cells = <1>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; - ramoops@0x07400000 { compatible = "ramoops"; reg = <0x07400000 0x00100000>; @@ -1362,8 +1356,3 @@ ssctl = <0>; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - 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 90a64b487dc6..a312a66ae631 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p241_v2-1g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p241_v2-1g.dts @@ -50,12 +50,6 @@ #size-cells = <1>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; - ramoops@0x07400000 { compatible = "ramoops"; reg = <0x07400000 0x00100000>; @@ -1310,8 +1304,3 @@ ssctl = <0>; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - 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 3e98b8ecb74e..f65c85878ebb 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 @@ -50,12 +50,6 @@ #size-cells = <1>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; - ramoops@0x07400000 { compatible = "ramoops"; reg = <0x07400000 0x00100000>; @@ -1361,8 +1355,3 @@ ssctl = <0>; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - diff --git a/arch/arm/boot/dts/amlogic/gxl_p400_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p400_2g.dts index 77564ca5950f..70b70d7a2e73 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p400_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p400_2g.dts @@ -46,12 +46,6 @@ #size-cells = <1>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; - ramoops@0x07400000 { compatible = "ramoops"; reg = <0x07400000 0x00100000>; @@ -877,8 +871,3 @@ }; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - diff --git a/arch/arm/boot/dts/amlogic/gxl_p401_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p401_2g.dts index 1d628bfd3227..95a4060cea5c 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p401_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p401_2g.dts @@ -46,12 +46,6 @@ #size-cells = <1>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; - ramoops@0x07400000 { compatible = "ramoops"; reg = <0x07400000 0x00100000>; @@ -965,8 +959,3 @@ }; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - diff --git a/arch/arm/boot/dts/amlogic/gxl_sei210_1g.dts b/arch/arm/boot/dts/amlogic/gxl_sei210_1g.dts index 8a7b86ee8866..2c77572a9bb2 100644 --- a/arch/arm/boot/dts/amlogic/gxl_sei210_1g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_sei210_1g.dts @@ -50,12 +50,6 @@ #size-cells = <1>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; - secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; reusable; @@ -1212,8 +1206,3 @@ ssctl = <0>; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - diff --git a/arch/arm/boot/dts/amlogic/gxl_sei210_2g.dts b/arch/arm/boot/dts/amlogic/gxl_sei210_2g.dts index 35555bd7e77d..1d6ccece2364 100644 --- a/arch/arm/boot/dts/amlogic/gxl_sei210_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_sei210_2g.dts @@ -51,12 +51,6 @@ #size-cells = <1>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; - ramoops@0x07400000 { compatible = "ramoops"; reg = <0x07400000 0x00100000>; @@ -1206,8 +1200,3 @@ status = "okay"; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - diff --git a/arch/arm/boot/dts/amlogic/gxl_skt.dts b/arch/arm/boot/dts/amlogic/gxl_skt.dts index f73b2da87342..240ea538b9c9 100644 --- a/arch/arm/boot/dts/amlogic/gxl_skt.dts +++ b/arch/arm/boot/dts/amlogic/gxl_skt.dts @@ -50,12 +50,6 @@ #size-cells = <1>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; - secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; reusable; @@ -1218,8 +1212,3 @@ ssctl = <0>; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - diff --git a/arch/arm/boot/dts/amlogic/mesongxl.dtsi b/arch/arm/boot/dts/amlogic/mesongxl.dtsi index e31fa431d257..a220ea1c4fd3 100644 --- a/arch/arm/boot/dts/amlogic/mesongxl.dtsi +++ b/arch/arm/boot/dts/amlogic/mesongxl.dtsi @@ -573,7 +573,7 @@ compatible = "amlogic, defendkey"; reg = <0xc8834500 0x4>; /*RNG_USR_DATA*/ mem_size = <0x0 0x100000>; - status = "disabled"; + status = "okay"; }; }; /* end of root */ diff --git a/arch/arm/boot/dts/amlogic/mesongxl_sei210.dtsi b/arch/arm/boot/dts/amlogic/mesongxl_sei210.dtsi index 3ebecc55303d..9f4e451d488d 100644 --- a/arch/arm/boot/dts/amlogic/mesongxl_sei210.dtsi +++ b/arch/arm/boot/dts/amlogic/mesongxl_sei210.dtsi @@ -549,7 +549,7 @@ compatible = "amlogic, defendkey"; reg = <0xc8834500 0x4>; /*RNG_USR_DATA*/ mem_size = <0x0 0x100000>; - status = "disabled"; + status = "okay"; }; }; /* end of root */ diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts index 4ffb77192ff2..581a4e7cf668 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts @@ -50,12 +50,6 @@ #size-cells = <2>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; - secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; reusable; @@ -1228,8 +1222,3 @@ ssctl = <0>; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - 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 01cbc49b39c7..af4354c9f8b2 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts @@ -48,12 +48,6 @@ #size-cells = <2>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; - secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; reusable; @@ -1267,8 +1261,3 @@ ssctl = <0>; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - 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 6474f3dbc63d..756275df18ae 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p212_1g_hd.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p212_1g_hd.dts @@ -50,12 +50,6 @@ #size-cells = <2>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; - secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; reusable; @@ -1211,8 +1205,3 @@ ssctl = <0>; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts index 8eeb24a1d2cb..ee7b6bf64fff 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts @@ -51,12 +51,6 @@ #size-cells = <2>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; - ramoops@0x07400000 { compatible = "ramoops"; reg = <0x0 0x07400000 0x0 0x00100000>; @@ -1221,8 +1215,3 @@ status = "okay"; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - 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 dbf7573e693e..2a1f93b7b425 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts @@ -50,12 +50,6 @@ #size-cells = <2>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; - secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; reusable; @@ -1252,8 +1246,3 @@ status = "okay"; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - diff --git a/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts index b91b9cc1c243..d3bff2aca6d6 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts @@ -51,12 +51,6 @@ #size-cells = <2>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; - ramoops@0x07400000 { compatible = "ramoops"; reg = <0x0 0x07400000 0x0 0x00100000>; @@ -1354,8 +1348,3 @@ }; }; /* end of pinctrl_periphs */ -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - 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 743b3dd0fbb0..d68329648181 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p230_2g_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p230_2g_buildroot.dts @@ -51,12 +51,6 @@ #size-cells = <2>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; - ramoops@0x07400000 { compatible = "ramoops"; reg = <0x0 0x07400000 0x0 0x00100000>; @@ -1368,7 +1362,3 @@ }; }; /* end of pinctrl_periphs */ -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; diff --git a/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts index 431a89b62c75..16fd2294d8a4 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts @@ -51,12 +51,6 @@ #size-cells = <2>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; - ramoops@0x07400000 { compatible = "ramoops"; reg = <0x0 0x07400000 0x0 0x00100000>; @@ -1126,8 +1120,3 @@ status = "okay"; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - diff --git a/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts index 3a8debc791b6..18bd9d26b34b 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts @@ -51,12 +51,6 @@ #size-cells = <2>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; - ramoops@0x07400000 { compatible = "ramoops"; reg = <0x0 0x07400000 0x0 0x00100000>; @@ -1126,8 +1120,3 @@ status = "okay"; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - 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 38baf84f7f50..5cfdf96c4142 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts @@ -48,12 +48,6 @@ #size-cells = <2>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; - ramoops@0x07400000 { compatible = "ramoops"; reg = <0x0 0x07400000 0x0 0x00100000>; @@ -1195,8 +1189,3 @@ status = "okay"; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts index ac6762afe17d..5f28a27acea4 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts @@ -50,12 +50,6 @@ #size-cells = <2>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; - ramoops@0x07400000 { compatible = "ramoops"; reg = <0x0 0x07400000 0x0 0x00100000>; @@ -1306,8 +1300,3 @@ ssctl = <0>; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - 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 f97a66ba5fe1..01f333a3a692 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts @@ -50,12 +50,6 @@ #size-cells = <2>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; - ramoops@0x07400000 { compatible = "ramoops"; reg = <0x0 0x07400000 0x0 0x00100000>; @@ -1361,8 +1355,3 @@ ssctl = <0>; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - 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 1701c67ec66a..2493b0e884a0 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts @@ -51,12 +51,6 @@ #size-cells = <2>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; - ramoops@0x07400000 { compatible = "ramoops"; reg = <0x0 0x07400000 0x0 0x00100000>; @@ -1307,8 +1301,3 @@ ssctl = <0>; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - 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 fa8d2503577b..3950d2cf44dc 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 @@ -50,12 +50,6 @@ #size-cells = <2>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; - ramoops@0x07400000 { compatible = "ramoops"; reg = <0x0 0x07400000 0x0 0x00100000>; @@ -1360,8 +1354,3 @@ ssctl = <0>; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - diff --git a/arch/arm64/boot/dts/amlogic/gxl_p400_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p400_2g.dts index da31313a6586..7ba7ce2b46f0 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p400_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p400_2g.dts @@ -46,12 +46,6 @@ #size-cells = <2>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; - ramoops@0x07400000 { compatible = "ramoops"; reg = <0x0 0x07400000 0x0 0x00100000>; @@ -877,8 +871,3 @@ }; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - diff --git a/arch/arm64/boot/dts/amlogic/gxl_p401_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p401_2g.dts index 2580c613bcb5..56cc4cb7daef 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p401_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p401_2g.dts @@ -46,12 +46,6 @@ #size-cells = <2>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; - ramoops@0x07400000 { compatible = "ramoops"; reg = <0x0 0x07400000 0x0 0x00100000>; @@ -965,8 +959,3 @@ }; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - diff --git a/arch/arm64/boot/dts/amlogic/gxl_sei210_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_sei210_1g.dts index 62b8ab55aa89..d7b19b7709fe 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_sei210_1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_sei210_1g.dts @@ -50,12 +50,6 @@ #size-cells = <2>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; - secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; reusable; @@ -1211,8 +1205,3 @@ ssctl = <0>; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - diff --git a/arch/arm64/boot/dts/amlogic/gxl_sei210_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_sei210_2g.dts index 8f3a1faefe0d..c6ec955ee017 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_sei210_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_sei210_2g.dts @@ -51,12 +51,6 @@ #size-cells = <2>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; - ramoops@0x07400000 { compatible = "ramoops"; reg = <0x0 0x07400000 0x0 0x00100000>; @@ -1206,8 +1200,3 @@ status = "okay"; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - diff --git a/arch/arm64/boot/dts/amlogic/gxl_skt.dts b/arch/arm64/boot/dts/amlogic/gxl_skt.dts index 172f9c9b85c1..330175a84188 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_skt.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_skt.dts @@ -50,12 +50,6 @@ #size-cells = <2>; ranges; /* global autoconfigured region for contiguous allocations */ - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; - secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; reusable; @@ -1217,8 +1211,3 @@ ssctl = <0>; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - diff --git a/arch/arm64/boot/dts/amlogic/mesongxl.dtsi b/arch/arm64/boot/dts/amlogic/mesongxl.dtsi index 4a6581ec3ae2..643a922dd599 100644 --- a/arch/arm64/boot/dts/amlogic/mesongxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesongxl.dtsi @@ -559,7 +559,7 @@ compatible = "amlogic, defendkey"; reg = <0x0 0xc8834500 0x0 0x4>; /*RNG_USR_DATA*/ mem_size = <0x0 0x100000>; - status = "disabled"; + status = "okay"; }; }; /* end of root */ diff --git a/arch/arm64/boot/dts/amlogic/mesongxl_sei210.dtsi b/arch/arm64/boot/dts/amlogic/mesongxl_sei210.dtsi index 82e31ce7a298..a66605342869 100644 --- a/arch/arm64/boot/dts/amlogic/mesongxl_sei210.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesongxl_sei210.dtsi @@ -549,7 +549,7 @@ compatible = "amlogic, defendkey"; reg = <0x0 0xc8834500 0x0 0x4>; /*RNG_USR_DATA*/ mem_size = <0x0 0x100000>; - status = "disabled"; + status = "okay"; }; }; /* end of root */