aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/dts/uniphier-pxs3.dtsi
diff options
context:
space:
mode:
authorMasahiro Yamada2019-07-10 20:07:29 +0900
committerMasahiro Yamada2019-07-10 22:41:50 +0900
commit47eb8add270419722a562acd7e78088eddcf9488 (patch)
tree25afb87c8cf95b7ef486f9eb82a28b58b2de2c89 /arch/arm/dts/uniphier-pxs3.dtsi
parent9424ecd735e73af7d47ca18b705af3a90804c676 (diff)
arm64: dts: uniphier: add reserved-memory for secure memory
[ Linux commit aa38571246c6ac279ebebd141157297bcb959d76 ] The memory regions specified by /memreserve/ are passed to early_init_dt_reserve_memory_arch() with nomap=false, so it is not suitable for reserving memory for Trusted Firmware-A etc. Use the more robust /reserved-memory node with the no-map property to prevent the kernel from mapping it. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/arm/dts/uniphier-pxs3.dtsi')
-rw-r--r--arch/arm/dts/uniphier-pxs3.dtsi13
1 files changed, 11 insertions, 2 deletions
diff --git a/arch/arm/dts/uniphier-pxs3.dtsi b/arch/arm/dts/uniphier-pxs3.dtsi
index 961d4d3621f..b1aff285c8b 100644
--- a/arch/arm/dts/uniphier-pxs3.dtsi
+++ b/arch/arm/dts/uniphier-pxs3.dtsi
@@ -8,8 +8,6 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/gpio/uniphier-gpio.h>
-/memreserve/ 0x80000000 0x02000000;
-
/ {
compatible = "socionext,uniphier-pxs3";
#address-cells = <2>;
@@ -138,6 +136,17 @@
<1 10 4>;
};
+ reserved-memory {
+ #address-cells = <2>;
+ #size-cells = <2>;
+ ranges;
+
+ secure-memory@81000000 {
+ reg = <0x0 0x81000000 0x0 0x01000000>;
+ no-map;
+ };
+ };
+
soc@0 {
compatible = "simple-bus";
#address-cells = <1>;