diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-03-30 16:16:28 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-03-30 16:16:28 +0200 |
| commit | 414d06ace9cca3725b6c2072e1951e1e03807f63 (patch) | |
| tree | 31e3c2c3da9260d5541e3d8de7045aabcbf66033 /arch/arm64 | |
| parent | Linux 4.11-rc3 (diff) | |
| parent | arm64: dt: hikey: Add optee node (diff) | |
| download | linux-414d06ace9cca3725b6c2072e1951e1e03807f63.tar.xz linux-414d06ace9cca3725b6c2072e1951e1e03807f63.zip | |
Merge tag 'tee-drv-for-4.12' of git://git.linaro.org:/people/jens.wiklander/linux-tee into next/tee
Pull "generic TEE subsystem for v4.12"
Introduce generic TEE subsystem:
- the TEE subsystem itself
- an OP-TEE driver using the subsystem
- optee bindings
- optee node for hi6220-hikey.dts
* tag 'tee-drv-for-4.12' of git://git.linaro.org:/people/jens.wiklander/linux-tee:
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 dba3c131c62c..89c15399bec2 100644 --- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts +++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts @@ -406,6 +406,13 @@ }; }; }; + + firmware { + optee { + compatible = "linaro,optee-tz"; + method = "smc"; + }; + }; }; &uart2 { |