diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-05-10 21:03:31 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-05-10 21:03:31 +0200 |
| commit | e038d5515b4a0c0946f331f4eeaa538453a89c36 (patch) | |
| tree | 740f90fae4d41d496de6acbb9c4393bdad5ee882 /arch/arm64 | |
| parent | 6cde26fda11b3e7bcc17574c6a71e96ac40f2573 (diff) | |
| parent | 14e21cb8f811100a2104e952b8f5bc0326a5e213 (diff) | |
Merge branch 'tee/initial-merge' into fixes
This is a dependency for the following fix
* tee/initial-merge:
arm64: dt: hikey: Add optee node
Documentation: tee subsystem and op-tee driver
tee: add OP-TEE driver
tee: generic TEE subsystem
dt/bindings: add bindings for optee
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts index 9b4ba7169210..75bce2d0b1a8 100644 --- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts +++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts @@ -411,6 +411,13 @@ }; }; }; + + firmware { + optee { + compatible = "linaro,optee-tz"; + method = "smc"; + }; + }; }; &uart2 { |