From 5e9efdf53f33b9f488d48487a92d8ac62863647b Mon Sep 17 00:00:00 2001 From: Zhongfu Luo Date: Tue, 27 Nov 2018 13:55:10 +0800 Subject: [PATCH] dts: GXL/TXL: adjust defendkey_reserved location [1/1] PD#SWPL-2539 Problem: defendkey_reserved have influenced on display during the system boot up Solution: adjust defendkey_reserved node location Verify: GXL/TXL skt board verify pass Change-Id: I5cf0245f9653e20224c4e3bab1f6f05527011210 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 | 11 ++++++----- 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 ++++++----- arch/arm/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts | 11 ++++++----- arch/arm/boot/dts/amlogic/gxl_p400_2g.dts | 12 ++++++------ 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/txl_t950_p341.dts | 12 ++++++------ arch/arm/boot/dts/amlogic/txl_t960_p346.dts | 12 ++++++------ arch/arm/boot/dts/amlogic/txl_t962_p320.dts | 12 ++++++------ arch/arm/boot/dts/amlogic/txl_t962_p321.dts | 12 ++++++------ arch/arm/boot/dts/amlogic/txl_t962_p321_720p.dts | 12 ++++++------ 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 | 11 ++++++----- 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 ++++++----- arch/arm64/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 | 12 ++++++------ 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/txl_t950_p341.dts | 12 ++++++------ arch/arm64/boot/dts/amlogic/txl_t960_p346.dts | 12 ++++++------ arch/arm64/boot/dts/amlogic/txl_t962_p320.dts | 12 ++++++------ arch/arm64/boot/dts/amlogic/txl_t962_p321.dts | 12 ++++++------ arch/arm64/boot/dts/amlogic/txl_t962_p321_720p.dts | 12 ++++++------ 48 files changed, 288 insertions(+), 252 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/gxl_p212_1g.dts b/arch/arm/boot/dts/amlogic/gxl_p212_1g.dts index 424c21c..6169a28 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p212_1g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p212_1g.dts @@ -50,6 +50,12 @@ #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; @@ -142,11 +148,6 @@ alignment = <0x100000>; //no-map; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; }; dummy-battery { 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 519cfc8..28068b6 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p212_1g_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p212_1g_buildroot.dts @@ -48,6 +48,12 @@ #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; @@ -128,11 +134,6 @@ alignment = <0x100000>; //no-map; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; }; bt-dev{ 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 e723f65..9ed888c 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p212_1g_hd.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p212_1g_hd.dts @@ -50,6 +50,12 @@ #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; @@ -138,11 +144,6 @@ alignment = <0x100000>; //no-map; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; }; bt-dev{ diff --git a/arch/arm/boot/dts/amlogic/gxl_p212_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p212_2g.dts index f98158d..13a27d1 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p212_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p212_2g.dts @@ -51,6 +51,12 @@ #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>; @@ -148,11 +154,6 @@ alignment = <0x100000>; //no-map; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; }; dummy-battery { 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 0d865a3..12b3d17 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p212_2g_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p212_2g_buildroot.dts @@ -50,6 +50,12 @@ #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; @@ -128,11 +134,6 @@ alignment = <0x100000>; //no-map; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; }; bt-dev{ diff --git a/arch/arm/boot/dts/amlogic/gxl_p230_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p230_2g.dts index 70832ef..bffe36f 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p230_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p230_2g.dts @@ -51,6 +51,12 @@ #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>; @@ -148,11 +154,6 @@ alignment = <0x100000>; //no-map; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; }; bt-dev{ compatible = "amlogic, bt-dev"; 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 196fc62..a50d946 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p230_2g_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p230_2g_buildroot.dts @@ -51,6 +51,12 @@ #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>; @@ -146,11 +152,6 @@ alignment = <0x100000>; //no-map; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; }; bt-dev{ compatible = "amlogic, bt-dev"; diff --git a/arch/arm/boot/dts/amlogic/gxl_p231_1g.dts b/arch/arm/boot/dts/amlogic/gxl_p231_1g.dts index af71ed0..9ef02c8 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p231_1g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p231_1g.dts @@ -51,6 +51,12 @@ #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>; @@ -148,11 +154,6 @@ alignment = <0x100000>; //no-map; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; }; bt-dev{ diff --git a/arch/arm/boot/dts/amlogic/gxl_p231_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p231_2g.dts index f51479c..25d959d 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p231_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p231_2g.dts @@ -51,6 +51,12 @@ #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>; @@ -147,11 +153,6 @@ alignment = <0x100000>; //no-map; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; }; bt-dev{ 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 1996859..7a36a46 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p231_2g_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p231_2g_buildroot.dts @@ -48,6 +48,12 @@ #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>; @@ -138,11 +144,6 @@ alignment = <0x100000>; //no-map; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; }; bt-dev{ diff --git a/arch/arm/boot/dts/amlogic/gxl_p241_1g.dts b/arch/arm/boot/dts/amlogic/gxl_p241_1g.dts index 30c98d3..fc12eb9 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p241_1g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p241_1g.dts @@ -50,6 +50,12 @@ #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>; @@ -154,11 +160,6 @@ alignment = <0x100000>; //no-map; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; }; dummy-battery { 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 6d8523c..dc0a771 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p241_1g_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p241_1g_buildroot.dts @@ -50,6 +50,12 @@ #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>; @@ -142,11 +148,6 @@ alignment = <0x100000>; //no-map; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; }; vpu { 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 738a1dd..06eb3d7 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p241_v2-1g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p241_v2-1g.dts @@ -50,6 +50,12 @@ #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>; @@ -154,11 +160,6 @@ alignment = <0x100000>; //no-map; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; }; dummy-battery { 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 9049e83..c5130e0 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,6 +50,12 @@ #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>; @@ -141,11 +147,6 @@ alignment = <0x100000>; //no-map; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; }; vpu { diff --git a/arch/arm/boot/dts/amlogic/gxl_p400_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p400_2g.dts index deb4d1d..3304125 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p400_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p400_2g.dts @@ -46,6 +46,12 @@ #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>; @@ -75,12 +81,6 @@ alignment = <0x400000>; alloc-ranges = <0x7dc00000 0x2400000>; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; - }; wifi{ diff --git a/arch/arm/boot/dts/amlogic/gxl_p401_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p401_2g.dts index 6e6ac7e..e20b4a4 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p401_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p401_2g.dts @@ -46,6 +46,12 @@ #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>; @@ -75,11 +81,6 @@ alignment = <0x400000>; alloc-ranges = <0x7dc00000 0x2400000>; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; }; wifi{ diff --git a/arch/arm/boot/dts/amlogic/gxl_sei210_1g.dts b/arch/arm/boot/dts/amlogic/gxl_sei210_1g.dts index 2f6ce08..261986f 100644 --- a/arch/arm/boot/dts/amlogic/gxl_sei210_1g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_sei210_1g.dts @@ -50,6 +50,12 @@ #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; @@ -138,11 +144,6 @@ alignment = <0x100000>; //no-map; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; }; bt-dev{ diff --git a/arch/arm/boot/dts/amlogic/gxl_sei210_2g.dts b/arch/arm/boot/dts/amlogic/gxl_sei210_2g.dts index e24e9d3..2a366f0 100644 --- a/arch/arm/boot/dts/amlogic/gxl_sei210_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_sei210_2g.dts @@ -51,6 +51,12 @@ #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>; @@ -146,11 +152,6 @@ alignment = <0x100000>; //no-map; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; }; bt-dev{ diff --git a/arch/arm/boot/dts/amlogic/gxl_skt.dts b/arch/arm/boot/dts/amlogic/gxl_skt.dts index 211b1c9..0fba076 100644 --- a/arch/arm/boot/dts/amlogic/gxl_skt.dts +++ b/arch/arm/boot/dts/amlogic/gxl_skt.dts @@ -50,6 +50,12 @@ #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; @@ -139,11 +145,6 @@ alignment = <0x100000>; //no-map; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; }; dummy-battery { diff --git a/arch/arm/boot/dts/amlogic/txl_t950_p341.dts b/arch/arm/boot/dts/amlogic/txl_t950_p341.dts index 9149d26..ff39ed6 100644 --- a/arch/arm/boot/dts/amlogic/txl_t950_p341.dts +++ b/arch/arm/boot/dts/amlogic/txl_t950_p341.dts @@ -53,8 +53,13 @@ #address-cells = <1>; #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; @@ -169,11 +174,6 @@ size = <0x04000000>; alignment = <0x400000>; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; }; /* end of reserved-memory */ secmon { diff --git a/arch/arm/boot/dts/amlogic/txl_t960_p346.dts b/arch/arm/boot/dts/amlogic/txl_t960_p346.dts index 645bd09..d4f91e2 100644 --- a/arch/arm/boot/dts/amlogic/txl_t960_p346.dts +++ b/arch/arm/boot/dts/amlogic/txl_t960_p346.dts @@ -53,8 +53,13 @@ #address-cells = <1>; #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; @@ -169,11 +174,6 @@ size = <0x04000000>; alignment = <0x400000>; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; }; /* end of reserved-memory */ secmon { diff --git a/arch/arm/boot/dts/amlogic/txl_t962_p320.dts b/arch/arm/boot/dts/amlogic/txl_t962_p320.dts index a127a588..5c2ebbe 100644 --- a/arch/arm/boot/dts/amlogic/txl_t962_p320.dts +++ b/arch/arm/boot/dts/amlogic/txl_t962_p320.dts @@ -53,8 +53,13 @@ #address-cells = <1>; #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; @@ -159,11 +164,6 @@ size = <0x04000000>; alignment = <0x400000>; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; }; /* end of reserved-memory */ secmon { diff --git a/arch/arm/boot/dts/amlogic/txl_t962_p321.dts b/arch/arm/boot/dts/amlogic/txl_t962_p321.dts index fe056d1..93eb319 100644 --- a/arch/arm/boot/dts/amlogic/txl_t962_p321.dts +++ b/arch/arm/boot/dts/amlogic/txl_t962_p321.dts @@ -53,8 +53,13 @@ #address-cells = <1>; #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; @@ -155,11 +160,6 @@ /** alloc by self **/ alloc-ranges = <0x00000000 0x30000000>; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; }; /* end of reserved-memory */ dummy-battery { 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 4e4a61f..5146907 100644 --- a/arch/arm/boot/dts/amlogic/txl_t962_p321_720p.dts +++ b/arch/arm/boot/dts/amlogic/txl_t962_p321_720p.dts @@ -53,8 +53,13 @@ #address-cells = <1>; #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; @@ -155,11 +160,6 @@ /** alloc by self **/ alloc-ranges = <0x0 0x30000000>; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x08300000 0x100000>; - }; }; /* end of reserved-memory */ dummy-battery { diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts index 980fb89..0ceedde 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts @@ -50,6 +50,12 @@ #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; @@ -137,11 +143,6 @@ alignment = <0x0 0x100000>; //no-map; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; }; dummy-battery { 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 c6f85ec..5d5d9f0 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts @@ -48,6 +48,12 @@ #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; @@ -127,11 +133,6 @@ alignment = <0x0 0x100000>; //no-map; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; }; bt-dev{ 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 1418d8b..e2c7f28 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p212_1g_hd.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p212_1g_hd.dts @@ -50,6 +50,12 @@ #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; @@ -137,11 +143,6 @@ alignment = <0x0 0x100000>; //no-map; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; }; bt-dev{ diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts index a54f543..e459645 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts @@ -51,6 +51,12 @@ #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>; @@ -146,11 +152,6 @@ alignment = <0x0 0x100000>; //no-map; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; }; dummy-battery { 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 63b9c1e..78afcd7 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts @@ -50,6 +50,12 @@ #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; @@ -128,11 +134,6 @@ alignment = <0x0 0x100000>; //no-map; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; }; bt-dev{ diff --git a/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts index 407a7eb..8430c8f 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts @@ -51,6 +51,12 @@ #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>; @@ -146,11 +152,6 @@ alignment = <0x0 0x100000>; //no-map; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; }; bt-dev{ compatible = "amlogic, bt-dev"; 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 bda67d1..552dd1f 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p230_2g_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p230_2g_buildroot.dts @@ -51,6 +51,12 @@ #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>; @@ -146,11 +152,6 @@ alignment = <0x0 0x100000>; //no-map; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; }; bt-dev{ compatible = "amlogic, bt-dev"; diff --git a/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts index 01bdc4c..e2f9fd0 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts @@ -51,6 +51,12 @@ #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>; @@ -147,11 +153,6 @@ alignment = <0x0 0x100000>; //no-map; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; }; bt-dev{ diff --git a/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts index c71b1e1..7de8c68 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts @@ -51,6 +51,12 @@ #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>; @@ -147,11 +153,6 @@ alignment = <0x0 0x100000>; //no-map; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; }; bt-dev{ 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 8936bcd..082ef2c 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts @@ -48,6 +48,12 @@ #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>; @@ -138,11 +144,6 @@ alignment = <0x0 0x100000>; //no-map; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; }; bt-dev{ diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts index 98b016e..ba50836 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts @@ -50,6 +50,12 @@ #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>; @@ -150,11 +156,6 @@ alignment = <0x0 0x100000>; //no-map; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; }; dummy-battery { 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 36ae00d..d7878fb 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts @@ -50,6 +50,12 @@ #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>; @@ -141,11 +147,6 @@ alignment = <0x0 0x100000>; //no-map; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; }; vpu { 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 c341916..04e706d 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts @@ -51,6 +51,12 @@ #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>; @@ -151,11 +157,6 @@ alignment = <0x0 0x100000>; //no-map; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; }; dummy-battery { 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 55ce615..af17dfe 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,6 +50,12 @@ #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>; @@ -140,11 +146,6 @@ alignment = <0x0 0x100000>; //no-map; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; }; vpu { diff --git a/arch/arm64/boot/dts/amlogic/gxl_p400_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p400_2g.dts index 5e291d3..4e4591a 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p400_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p400_2g.dts @@ -46,6 +46,12 @@ #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>; @@ -75,11 +81,6 @@ alignment = <0x0 0x400000>; alloc-ranges = <0x0 0x7dc00000 0x0 0x2400000>; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; }; wifi{ diff --git a/arch/arm64/boot/dts/amlogic/gxl_p401_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p401_2g.dts index 698972e..b52e9a4 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p401_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p401_2g.dts @@ -46,6 +46,12 @@ #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>; @@ -75,12 +81,6 @@ alignment = <0x0 0x400000>; alloc-ranges = <0x0 0x7dc00000 0x0 0x2400000>; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; - }; wifi{ diff --git a/arch/arm64/boot/dts/amlogic/gxl_sei210_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_sei210_1g.dts index 53d476b..89df061 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_sei210_1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_sei210_1g.dts @@ -50,6 +50,12 @@ #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; @@ -137,11 +143,6 @@ alignment = <0x0 0x100000>; //no-map; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; }; bt-dev{ diff --git a/arch/arm64/boot/dts/amlogic/gxl_sei210_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_sei210_2g.dts index cf86235..6e02cb8 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_sei210_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_sei210_2g.dts @@ -51,6 +51,12 @@ #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>; @@ -146,11 +152,6 @@ alignment = <0x0 0x100000>; //no-map; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; }; bt-dev{ diff --git a/arch/arm64/boot/dts/amlogic/gxl_skt.dts b/arch/arm64/boot/dts/amlogic/gxl_skt.dts index 85c6b54..e12c7c4 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_skt.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_skt.dts @@ -50,6 +50,12 @@ #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; @@ -138,11 +144,6 @@ alignment = <0x0 0x100000>; //no-map; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; }; dummy-battery { diff --git a/arch/arm64/boot/dts/amlogic/txl_t950_p341.dts b/arch/arm64/boot/dts/amlogic/txl_t950_p341.dts index e2d26f9..61adfcf 100644 --- a/arch/arm64/boot/dts/amlogic/txl_t950_p341.dts +++ b/arch/arm64/boot/dts/amlogic/txl_t950_p341.dts @@ -53,8 +53,13 @@ #address-cells = <2>; #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; @@ -168,11 +173,6 @@ size = <0x0 0x04000000>; alignment = <0x0 0x400000>; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; }; /* end of reserved-memory */ secmon { diff --git a/arch/arm64/boot/dts/amlogic/txl_t960_p346.dts b/arch/arm64/boot/dts/amlogic/txl_t960_p346.dts index 05f37ad..48bb78e 100644 --- a/arch/arm64/boot/dts/amlogic/txl_t960_p346.dts +++ b/arch/arm64/boot/dts/amlogic/txl_t960_p346.dts @@ -53,8 +53,13 @@ #address-cells = <2>; #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; @@ -168,11 +173,6 @@ size = <0x0 0x04000000>; alignment = <0x0 0x400000>; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; }; /* end of reserved-memory */ secmon { diff --git a/arch/arm64/boot/dts/amlogic/txl_t962_p320.dts b/arch/arm64/boot/dts/amlogic/txl_t962_p320.dts index 2fa72b2..37fe7c7 100644 --- a/arch/arm64/boot/dts/amlogic/txl_t962_p320.dts +++ b/arch/arm64/boot/dts/amlogic/txl_t962_p320.dts @@ -53,8 +53,13 @@ #address-cells = <2>; #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; @@ -159,11 +164,6 @@ size = <0x0 0x04000000>; alignment = <0x0 0x400000>; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; }; /* end of reserved-memory */ secmon { diff --git a/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts b/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts index 38aad4b..09240bf 100644 --- a/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts +++ b/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts @@ -53,8 +53,13 @@ #address-cells = <2>; #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; @@ -147,11 +152,6 @@ size = <0x0 0x01000000>; alignment = <0x0 0x400000>; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; }; /* end of reserved-memory */ dummy-battery { 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 edbe306..3a13b31 100644 --- a/arch/arm64/boot/dts/amlogic/txl_t962_p321_720p.dts +++ b/arch/arm64/boot/dts/amlogic/txl_t962_p321_720p.dts @@ -53,8 +53,13 @@ #address-cells = <2>; #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; @@ -147,11 +152,6 @@ size = <0x0 0x01000000>; alignment = <0x0 0x400000>; }; - - defendkey_reserved:linux,defendkey { - compatible = "amlogic, defendkey"; - reg = <0x0 0x08300000 0x0 0x100000>; - }; }; /* end of reserved-memory */ dummy-battery { -- 2.7.4