Patched in Tegra support.

1 files changed, 19 insertions, 84 deletions

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 87ec4d027c2..b6994751719 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -18,7 +18,7 @@ config CRYPTO_DEV_PADLOCK
           (so called VIA PadLock ACE, Advanced Cryptography Engine)
           that provides instructions for very fast cryptographic
           operations with supported algorithms.
-          
+
           The instructions are used only when the CPU supports them.
           Otherwise software encryption is used.
 
@@ -64,6 +64,7 @@ config CRYPTO_DEV_GEODE
 config ZCRYPT
         tristate "Support for PCI-attached cryptographic adapters"
         depends on S390
+        select ZCRYPT_MONOLITHIC if ZCRYPT="y"
         select HW_RANDOM
         help
           Select this option if you want to use a PCI-attached cryptographic
@@ -76,6 +77,14 @@ config ZCRYPT
           + Crypto Express3 Coprocessor (CEX3C)
           + Crypto Express3 Accelerator (CEX3A)
 
+config ZCRYPT_MONOLITHIC
+        bool "Monolithic zcrypt module"
+        depends on ZCRYPT
+        help
+          Select this option if you want to have a single module z90crypt,
+          that contains all parts of the crypto device driver (ap bus,
+          request router and all the card drivers).
+
 config CRYPTO_SHA1_S390
         tristate "SHA1 digest algorithm"
         depends on S390
@@ -111,7 +120,6 @@ config CRYPTO_DES_S390
         depends on S390
         select CRYPTO_ALGAPI
         select CRYPTO_BLKCIPHER
-        select CRYPTO_DES
         help
           This is the s390 hardware accelerated implementation of the
           DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).
@@ -165,7 +173,6 @@ config CRYPTO_DEV_MV_CESA
         select CRYPTO_ALGAPI
         select CRYPTO_AES
         select CRYPTO_BLKCIPHER2
-        select CRYPTO_HASH
         help
           This driver allows you to utilize the Cryptographic Engines and
           Security Accelerator (CESA) which can be found on the Marvell Orion
@@ -193,7 +200,6 @@ config CRYPTO_DEV_HIFN_795X
         select CRYPTO_BLKCIPHER
         select HW_RANDOM if CRYPTO_DEV_HIFN_795X_RNG
         depends on PCI
-        depends on !ARCH_DMA_ADDR_T_64BIT
         help
           This option allows you to have support for HIFN 795x crypto adapters.
 
@@ -224,7 +230,7 @@ config CRYPTO_DEV_TALITOS
 
 config CRYPTO_DEV_IXP4XX
         tristate "Driver for IXP4xx crypto hardware acceleration"
-        depends on ARCH_IXP4XX && IXP4XX_QMGR && IXP4XX_NPE
+        depends on ARCH_IXP4XX
         select CRYPTO_DES
         select CRYPTO_ALGAPI
         select CRYPTO_AUTHENC
@@ -254,14 +260,13 @@ config CRYPTO_DEV_OMAP_AES
         tristate "Support for OMAP AES hw engine"
         depends on ARCH_OMAP2 || ARCH_OMAP3
         select CRYPTO_AES
-        select CRYPTO_BLKCIPHER2
         help
           OMAP processors have AES module accelerator. Select this if you
           want to use the OMAP module for AES algorithms.
 
 config CRYPTO_DEV_PICOXCELL
         tristate "Support for picoXcell IPSEC and Layer2 crypto engines"
-        depends on ARCH_PICOXCELL && HAVE_CLK
+        depends on ARCH_PICOXCELL
         select CRYPTO_AES
         select CRYPTO_AUTHENC
         select CRYPTO_ALGAPI
@@ -289,89 +294,19 @@ config CRYPTO_DEV_S5P
 
 config CRYPTO_DEV_TEGRA_AES
         tristate "Support for TEGRA AES hw engine"
-        depends on ARCH_TEGRA
+        depends on ARCH_TEGRA_2x_SOC || ARCH_TEGRA_3x_SOC
         select CRYPTO_AES
+        select TEGRA_ARB_SEMAPHORE
         help
           TEGRA processors have AES module accelerator. Select this if you
           want to use the TEGRA module for AES algorithms.
 
-          To compile this driver as a module, choose M here: the module
-          will be called tegra-aes.
-
-config CRYPTO_DEV_NX
-        bool "Support for IBM Power7+ in-Nest cryptographic acceleration"
-        depends on PPC64 && IBMVIO
-        default n
-        help
-          Support for Power7+ in-Nest cryptographic acceleration.
-
-if CRYPTO_DEV_NX
-        source "drivers/crypto/nx/Kconfig"
-endif
-
-config CRYPTO_DEV_UX500
-        tristate "Driver for ST-Ericsson UX500 crypto hardware acceleration"
-        depends on ARCH_U8500
-        select CRYPTO_ALGAPI
-        help
-          Driver for ST-Ericsson UX500 crypto engine.
-
-if CRYPTO_DEV_UX500
-        source "drivers/crypto/ux500/Kconfig"
-endif # if CRYPTO_DEV_UX500
-
-config CRYPTO_DEV_BFIN_CRC
-        tristate "Support for Blackfin CRC hardware"
-        depends on BF60x
-        help
-          Newer Blackfin processors have CRC hardware. Select this if you
-          want to use the Blackfin CRC module.
-
-config CRYPTO_DEV_ATMEL_AES
-        tristate "Support for Atmel AES hw accelerator"
-        depends on ARCH_AT91
-        select CRYPTO_CBC
-        select CRYPTO_ECB
+config CRYPTO_DEV_TEGRA_SE
+        tristate "Tegra SE driver for crypto algorithms"
+        depends on ARCH_TEGRA_3x_SOC
         select CRYPTO_AES
-        select CRYPTO_ALGAPI
-        select CRYPTO_BLKCIPHER
-        select AT_HDMAC
-        help
-          Some Atmel processors have AES hw accelerator.
-          Select this if you want to use the Atmel module for
-          AES algorithms.
-
-          To compile this driver as a module, choose M here: the module
-          will be called atmel-aes.
-
-config CRYPTO_DEV_ATMEL_TDES
-        tristate "Support for Atmel DES/TDES hw accelerator"
-        depends on ARCH_AT91
-        select CRYPTO_DES
-        select CRYPTO_CBC
-        select CRYPTO_ECB
-        select CRYPTO_ALGAPI
-        select CRYPTO_BLKCIPHER
         help
-          Some Atmel processors have DES/TDES hw accelerator.
-          Select this if you want to use the Atmel module for
-          DES/TDES algorithms.
-
-          To compile this driver as a module, choose M here: the module
-          will be called atmel-tdes.
-
-config CRYPTO_DEV_ATMEL_SHA
-        tristate "Support for Atmel SHA1/SHA256 hw accelerator"
-        depends on ARCH_AT91
-        select CRYPTO_SHA1
-        select CRYPTO_SHA256
-        select CRYPTO_ALGAPI
-        help
-          Some Atmel processors have SHA1/SHA256 hw accelerator.
-          Select this if you want to use the Atmel module for
-          SHA1/SHA256 algorithms.
-
-          To compile this driver as a module, choose M here: the module
-          will be called atmel-sha.
+          This option allows you to have support of Security Engine for crypto
+          acceleration.
 
 endif # CRYPTO_HW