sched,perf: Fix periodic timers

[firefly-linux-kernel-4.4.55.git] / drivers / crypto / Kconfig

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 2fb0fdfc87df912f4ba926c1a6974e3803887c30..800bf41718e185e8337bce952e4f1783412f8741 100644 (file)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -391,7 +391,7 @@ config CRYPTO_DEV_ATMEL_SHA
 
 config CRYPTO_DEV_CCP
        bool "Support for AMD Cryptographic Coprocessor"
-       depends on (X86 && PCI) || ARM64
+       depends on ((X86 && PCI) || (ARM64 && (OF_ADDRESS || ACPI))) && HAS_IOMEM
        default n
        help
          The AMD Cryptographic Coprocessor provides hardware support
@@ -436,4 +436,26 @@ config CRYPTO_DEV_QCE
          hardware. To compile this driver as a module, choose M here. The
          module will be called qcrypto.
 
+config CRYPTO_DEV_VMX
+       bool "Support for VMX cryptographic acceleration instructions"
+       depends on PPC64
+       default n
+       help
+         Support for VMX cryptographic acceleration instructions.
+
+source "drivers/crypto/vmx/Kconfig"
+
+config CRYPTO_DEV_IMGTEC_HASH
+       depends on MIPS || COMPILE_TEST
+       tristate "Imagination Technologies hardware hash accelerator"
+       select CRYPTO_ALGAPI
+       select CRYPTO_MD5
+       select CRYPTO_SHA1
+       select CRYPTO_SHA256
+       select CRYPTO_HASH
+       help
+         This driver interfaces with the Imagination Technologies
+         hardware hash accelerator. Supporting MD5/SHA1/SHA224/SHA256
+         hashing algorithms.
+
 endif # CRYPTO_HW