diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-07 22:44:40 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-07 22:44:40 -0400 |
commit | 639b4ac691c6f6e48921dc576379c176f82f3250 (patch) | |
tree | 6cf521ae7d46ca8dfa139ca67dd32545de8d2a75 /Documentation | |
parent | 9d2cd01b15d0782adb81e40094b67904d77b03df (diff) | |
parent | 5208ed2ca16526cdbec25abe594a3cc3aea210f4 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6 into next
Pull crypto updates from Herbert Xu:
"Here is the crypto update for 3.16:
- Added test vectors for SHA/AES-CCM/DES-CBC/3DES-CBC.
- Fixed a number of error-path memory leaks in tcrypt.
- Fixed error-path memory leak in caam.
- Removed unnecessary global mutex from mxs-dcp.
- Added ahash walk interface that can actually be asynchronous.
- Cleaned up caam error reporting.
- Allow crypto_user get operation to be used by non-root users.
- Add support for SSS module on Exynos.
- Misc fixes"
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6: (60 commits)
crypto: testmgr - add aead cbc des, des3_ede tests
crypto: testmgr - Fix DMA-API warning
crypto: cesa - tfm->__crt_alg->cra_type directly
crypto: sahara - tfm->__crt_alg->cra_name directly
crypto: padlock - tfm->__crt_alg->cra_name directly
crypto: n2 - tfm->__crt_alg->cra_name directly
crypto: dcp - tfm->__crt_alg->cra_name directly
crypto: cesa - tfm->__crt_alg->cra_name directly
crypto: ccp - tfm->__crt_alg->cra_name directly
crypto: geode - Don't use tfm->__crt_alg->cra_name directly
crypto: geode - Weed out printk() from probe()
crypto: geode - Consistently use AES_KEYSIZE_128
crypto: geode - Kill AES_IV_LENGTH
crypto: geode - Kill AES_MIN_BLOCK_SIZE
crypto: mxs-dcp - Remove global mutex
crypto: hash - Add real ahash walk interface
hwrng: n2-drv - Introduce the use of the managed version of kzalloc
crypto: caam - reinitialize keys_fit_inline for decrypt and givencrypt
crypto: s5p-sss - fix multiplatform build
hwrng: timeriomem - remove unnecessary OOM messages
...
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/crypto/samsung-sss.txt | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/crypto/samsung-sss.txt b/Documentation/devicetree/bindings/crypto/samsung-sss.txt new file mode 100644 index 000000000000..a6dafa83c6df --- /dev/null +++ b/Documentation/devicetree/bindings/crypto/samsung-sss.txt | |||
@@ -0,0 +1,34 @@ | |||
1 | Samsung SoC SSS (Security SubSystem) module | ||
2 | |||
3 | The SSS module in S5PV210 SoC supports the following: | ||
4 | -- Feeder (FeedCtrl) | ||
5 | -- Advanced Encryption Standard (AES) | ||
6 | -- Data Encryption Standard (DES)/3DES | ||
7 | -- Public Key Accelerator (PKA) | ||
8 | -- SHA-1/SHA-256/MD5/HMAC (SHA-1/SHA-256/MD5)/PRNG | ||
9 | -- PRNG: Pseudo Random Number Generator | ||
10 | |||
11 | The SSS module in Exynos4 (Exynos4210) and | ||
12 | Exynos5 (Exynos5420 and Exynos5250) SoCs | ||
13 | supports the following also: | ||
14 | -- ARCFOUR (ARC4) | ||
15 | -- True Random Number Generator (TRNG) | ||
16 | -- Secure Key Manager | ||
17 | |||
18 | Required properties: | ||
19 | |||
20 | - compatible : Should contain entries for this and backward compatible | ||
21 | SSS versions: | ||
22 | - "samsung,s5pv210-secss" for S5PV210 SoC. | ||
23 | - "samsung,exynos4210-secss" for Exynos4210, Exynos4212, Exynos4412, Exynos5250, | ||
24 | Exynos5260 and Exynos5420 SoCs. | ||
25 | - reg : Offset and length of the register set for the module | ||
26 | - interrupts : interrupt specifiers of SSS module interrupts, should contain | ||
27 | following entries: | ||
28 | - first : feed control interrupt (required for all variants), | ||
29 | - second : hash interrupt (required only for samsung,s5pv210-secss). | ||
30 | |||
31 | - clocks : list of clock phandle and specifier pairs for all clocks listed in | ||
32 | clock-names property. | ||
33 | - clock-names : list of device clock input names; should contain one entry | ||
34 | "secss". | ||