diff options
| author | Jens Wiklander <jens.wiklander@linaro.org> | 2016-03-29 11:01:28 +0200 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2016-10-24 12:27:53 +0100 |
| commit | 34e41e50dac7f9b40a80d440079bd117e0ebc769 (patch) | |
| tree | 08f738b3c04096a6dd4d43b9e854252d501c4217 | |
| parent | 93d445594849cc3908c0d2b077b0c92c7133d26e (diff) | |
arm64: dt: OP-TEE for Juno **not for mainline**
Configures Juno with OP-TEE.
Cherry-picked from SWG's kernel tree:
https://github.com/linaro-swg/linux/commit/98141f8a80f9af00346181f16b01d17dfc09e104
Then edited to fix up the conflicts.
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
Signed-off-by: Jon Medhurst <tixy@linaro.org>
| -rw-r--r-- | arch/arm64/boot/dts/arm/juno-base.dtsi | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi index 03cea2bc7194..0ad0a6b2dd5e 100644 --- a/arch/arm64/boot/dts/arm/juno-base.dtsi +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi @@ -146,6 +146,17 @@ <0x00000008 0x80000000 0x1 0x80000000>; }; + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + /* Shared memory between secure and non-secure world */ + optee@0xfee00000 { + reg = <0x00000000 0xfee00000 0 0x00200000>; + }; + }; + gpu@0x2d000000 { compatible = "arm,malit6xx", "arm,mali-midgard"; reg = <0x0 0x2d000000 0x0 0x4000>; @@ -182,3 +193,10 @@ /include/ "juno-motherboard.dtsi" }; + + firmware { + optee { + compatible = "linaro,optee-tz"; + method = "smc"; + }; + }; |