diff options
| author | Jens Wiklander <jens.wiklander@linaro.org> | 2016-03-29 11:01:28 +0200 |
|---|---|---|
| committer | Ryan Harkin <ryan.harkin@linaro.org> | 2016-10-20 17:34:27 +0100 |
| commit | 4fecaa664e0f606db7c97268c32d0884cdc9d980 (patch) | |
| tree | 9eb388d229a7ee0ff30e7897756da771207e8e82 | |
| parent | 738897a90d6054a74b07246c8760b9c96af461e0 (diff) | |
arm64: dt: OP-TEE for Juno **not for mainline**lsk-3.18-armlt-20161020
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>
Conflicts:
arch/arm64/boot/dts/arm/juno-base.dtsi
| -rw-r--r-- | arch/arm64/boot/dts/arm/juno-base.dtsi | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi index 66a404e2e892..e69047fef90b 100644 --- a/arch/arm64/boot/dts/arm/juno-base.dtsi +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi @@ -254,6 +254,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: gpu@0x2d000000 { compatible = "arm,malit6xx", "arm,mali-midgard"; #cooling-cells = <2>; /* min followed by max */ |