From 395a6b3f259855f128b197da8d724ee179ec5e4e Mon Sep 17 00:00:00 2001 From: Zhongfu Luo Date: Thu, 13 Dec 2018 17:57:20 +0800 Subject: [PATCH] dts: TXL: defendkey: modify reserve memory mode [2/2] PD#SWPL-2343 Problem: TXL need to modify reserve memory mode Solution: remove defendkey reserved memory in TXL dts Verify: TXL skt board verify pass Change-Id: I1d036d7f0e2cf713cb093e5f2a01e69603264664 Signed-off-by: Zhongfu Luo --- arch/arm/boot/dts/amlogic/mesontxl.dtsi | 2 +- arch/arm/boot/dts/amlogic/txl_t950_p341.dts | 11 ----------- arch/arm/boot/dts/amlogic/txl_t960_p346.dts | 11 ----------- arch/arm/boot/dts/amlogic/txl_t962_p320.dts | 11 ----------- arch/arm/boot/dts/amlogic/txl_t962_p321.dts | 11 ----------- arch/arm/boot/dts/amlogic/txl_t962_p321_720p.dts | 10 ---------- arch/arm64/boot/dts/amlogic/mesontxl.dtsi | 2 +- arch/arm64/boot/dts/amlogic/txl_t950_p341.dts | 11 ----------- arch/arm64/boot/dts/amlogic/txl_t960_p346.dts | 11 ----------- arch/arm64/boot/dts/amlogic/txl_t962_p320.dts | 11 ----------- arch/arm64/boot/dts/amlogic/txl_t962_p321.dts | 11 ----------- arch/arm64/boot/dts/amlogic/txl_t962_p321_720p.dts | 11 ----------- 12 files changed, 2 insertions(+), 111 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/mesontxl.dtsi b/arch/arm/boot/dts/amlogic/mesontxl.dtsi index 8a1e33fee4f4..0327f80e1b18 100644 --- a/arch/arm/boot/dts/amlogic/mesontxl.dtsi +++ b/arch/arm/boot/dts/amlogic/mesontxl.dtsi @@ -1078,7 +1078,7 @@ compatible = "amlogic, defendkey"; reg = <0xc8834500 0x4>; /*RNG_USR_DATA*/ mem_size = <0x0 0x100000>; - status = "disabled"; + status = "okay"; }; }; /* end of / */ diff --git a/arch/arm/boot/dts/amlogic/txl_t950_p341.dts b/arch/arm/boot/dts/amlogic/txl_t950_p341.dts index 18eb7c807324..15ff9f58337a 100644 --- a/arch/arm/boot/dts/amlogic/txl_t950_p341.dts +++ b/arch/arm/boot/dts/amlogic/txl_t950_p341.dts @@ -54,12 +54,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; @@ -1137,8 +1131,3 @@ status = "okay"; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - diff --git a/arch/arm/boot/dts/amlogic/txl_t960_p346.dts b/arch/arm/boot/dts/amlogic/txl_t960_p346.dts index 48b736bb8776..aebfe42fc220 100644 --- a/arch/arm/boot/dts/amlogic/txl_t960_p346.dts +++ b/arch/arm/boot/dts/amlogic/txl_t960_p346.dts @@ -54,12 +54,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; @@ -1144,8 +1138,3 @@ status = "okay"; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - diff --git a/arch/arm/boot/dts/amlogic/txl_t962_p320.dts b/arch/arm/boot/dts/amlogic/txl_t962_p320.dts index 5d78dbae6bcd..7da1261e98f5 100644 --- a/arch/arm/boot/dts/amlogic/txl_t962_p320.dts +++ b/arch/arm/boot/dts/amlogic/txl_t962_p320.dts @@ -54,12 +54,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; @@ -1153,8 +1147,3 @@ status = "okay"; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - diff --git a/arch/arm/boot/dts/amlogic/txl_t962_p321.dts b/arch/arm/boot/dts/amlogic/txl_t962_p321.dts index c262cf71323d..e11afc2d317a 100644 --- a/arch/arm/boot/dts/amlogic/txl_t962_p321.dts +++ b/arch/arm/boot/dts/amlogic/txl_t962_p321.dts @@ -54,12 +54,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; @@ -1203,8 +1197,3 @@ cs-gpios = <&gpio GPIOZ_3 0>; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - diff --git a/arch/arm/boot/dts/amlogic/txl_t962_p321_720p.dts b/arch/arm/boot/dts/amlogic/txl_t962_p321_720p.dts index 77eee786473d..d0ae1ba802a8 100644 --- a/arch/arm/boot/dts/amlogic/txl_t962_p321_720p.dts +++ b/arch/arm/boot/dts/amlogic/txl_t962_p321_720p.dts @@ -54,12 +54,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; @@ -1203,7 +1197,3 @@ cs-gpios = <&gpio GPIOZ_3 0>; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; diff --git a/arch/arm64/boot/dts/amlogic/mesontxl.dtsi b/arch/arm64/boot/dts/amlogic/mesontxl.dtsi index b4f2d2166ecd..92ad5675d12e 100644 --- a/arch/arm64/boot/dts/amlogic/mesontxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesontxl.dtsi @@ -1078,7 +1078,7 @@ compatible = "amlogic, defendkey"; reg = <0x0 0xc8834500 0x0 0x4>; /*RNG_USR_DATA*/ mem_size = <0x0 0x100000>; - status = "disabled"; + status = "okay"; }; }; /* end of / */ diff --git a/arch/arm64/boot/dts/amlogic/txl_t950_p341.dts b/arch/arm64/boot/dts/amlogic/txl_t950_p341.dts index 117751d9d274..64028ecfee72 100644 --- a/arch/arm64/boot/dts/amlogic/txl_t950_p341.dts +++ b/arch/arm64/boot/dts/amlogic/txl_t950_p341.dts @@ -54,12 +54,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; @@ -1137,8 +1131,3 @@ status = "okay"; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - diff --git a/arch/arm64/boot/dts/amlogic/txl_t960_p346.dts b/arch/arm64/boot/dts/amlogic/txl_t960_p346.dts index 22cc0832cde0..b6a0896c77bc 100644 --- a/arch/arm64/boot/dts/amlogic/txl_t960_p346.dts +++ b/arch/arm64/boot/dts/amlogic/txl_t960_p346.dts @@ -54,12 +54,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; @@ -1143,8 +1137,3 @@ status = "okay"; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - diff --git a/arch/arm64/boot/dts/amlogic/txl_t962_p320.dts b/arch/arm64/boot/dts/amlogic/txl_t962_p320.dts index 82b73a227fb9..2ed7d17dcf23 100644 --- a/arch/arm64/boot/dts/amlogic/txl_t962_p320.dts +++ b/arch/arm64/boot/dts/amlogic/txl_t962_p320.dts @@ -54,12 +54,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; @@ -1153,8 +1147,3 @@ status = "okay"; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - diff --git a/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts b/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts index 3b466dad9bd7..e2d776e8b200 100644 --- a/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts +++ b/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts @@ -54,12 +54,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; @@ -1195,8 +1189,3 @@ cs-gpios = <&gpio GPIOZ_3 0>; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; - diff --git a/arch/arm64/boot/dts/amlogic/txl_t962_p321_720p.dts b/arch/arm64/boot/dts/amlogic/txl_t962_p321_720p.dts index 04716559d0a2..3872619e0ecd 100644 --- a/arch/arm64/boot/dts/amlogic/txl_t962_p321_720p.dts +++ b/arch/arm64/boot/dts/amlogic/txl_t962_p321_720p.dts @@ -54,12 +54,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; @@ -1195,8 +1189,3 @@ cs-gpios = <&gpio GPIOZ_3 0>; }; -&defendkey { - memory-region = <&defendkey_reserved>; - status = "okay"; -}; -