From f3d70ea9b23f2bb8dcdc85af1e6aa74eb5dd2b6e 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 51b5c52110d7..6712e7731504 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 28068b6f30c5..2105b028b50a 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 9ed888c2eac3..1c9feacbf504 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 22175b616c21..04e17f3a95f2 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 12b3d1799690..d3c1a0fc2e63 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 41ba78f95ff3..5c8314d53d9a 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 6e20130031a8..4213a292a4b3 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 9ef02c8c729e..8ca654332e4d 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 25d959d3d015..95e97dbd9967 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 7a36a462cf5e..658cb5b7ed32 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 fb4e842d460f..590b3c0198f8 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 dc0a7719e64a..f68d359c54d3 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 aab11d5d4903..f7cf504250b0 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 c5130e0ddf84..70808ebaf1f1 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 3304125ec846..8300389f44a1 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 e20b4a49f384..6fa99b61e3f3 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 261986f11255..d3220d565d5c 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 2a366f0ab4a4..8f36cb84457e 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 6ba0818984cd..44914a81580e 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 b19d82825be7..d26cd2bb3bf3 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 5d5d9f04a390..edac4180ab4e 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 e2c7f28b8c60..b43f41ae6066 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 7f0e75702e99..cb0d7e1433d0 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 78afcd7d6e5c..b2a48e90b5a3 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 d68609825951..b2c34e74162f 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 1589a1fc4d96..bb8c58114048 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 e2f9fd08249d..d054fa4b35e4 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 7de8c686e36d..b5702a6db52b 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 082ef2c45305..800114c56de8 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 25ff34c41936..078e772e2391 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 d7878fb3cc2a..def676aa8249 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 b3dae7c545b3..71f920896bbd 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 af17dfec452d..0e68cccd5139 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 4e4591a8de05..ab695abaef22 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 b52e9a45c8bd..593c77612282 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 89df0610a32b..d3086aa44071 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 6e02cb8345f1..41e52477e181 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 6af8cb46e015..56ecf91888ef 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 */