Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[platform/kernel/linux-starfive.git] / drivers / crypto / Kconfig

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 0af0808..603413f 100644 (file)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -520,10 +520,13 @@ config CRYPTO_DEV_ATMEL_SHA
          To compile this driver as a module, choose M here: the module
          will be called atmel-sha.
 
+config CRYPTO_DEV_ATMEL_I2C
+       tristate
+
 config CRYPTO_DEV_ATMEL_ECC
        tristate "Support for Microchip / Atmel ECC hw accelerator"
-       depends on ARCH_AT91 || COMPILE_TEST
        depends on I2C
+       select CRYPTO_DEV_ATMEL_I2C
        select CRYPTO_ECDH
        select CRC16
        help
@@ -534,6 +537,21 @@ config CRYPTO_DEV_ATMEL_ECC
          To compile this driver as a module, choose M here: the module
          will be called atmel-ecc.
 
+config CRYPTO_DEV_ATMEL_SHA204A
+       tristate "Support for Microchip / Atmel SHA accelerator and RNG"
+       depends on I2C
+       select CRYPTO_DEV_ATMEL_I2C
+       select HW_RANDOM
+       select CRC16
+       help
+         Microhip / Atmel SHA accelerator and RNG.
+         Select this if you want to use the Microchip / Atmel SHA204A
+         module as a random number generator. (Other functions of the
+         chip are currently not exposed by this driver)
+
+         To compile this driver as a module, choose M here: the module
+         will be called atmel-sha204a.
+
 config CRYPTO_DEV_CCP
        bool "Support for AMD Secure Processor"
        depends on ((X86 && PCI) || (ARM64 && (OF_ADDRESS || ACPI))) && HAS_IOMEM