3 files changed, 23 insertions, 0 deletions

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 107822f43fc3..3e5186e5c50c 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -419,4 +419,20 @@ config CRYPTO_DEV_MXS_DCP
           will be called mxs-dcp.
 
 source "drivers/crypto/qat/Kconfig"
+
+config CRYPTO_DEV_QCE
+        tristate "Qualcomm crypto engine accelerator"
+        select CRYPTO_AES
+        select CRYPTO_DES
+        select CRYPTO_ECB
+        select CRYPTO_CBC
+        select CRYPTO_XTS
+        select CRYPTO_CTR
+        select CRYPTO_ALGAPI
+        select CRYPTO_BLKCIPHER
+        help
+          This driver supports Qualcomm crypto engine accelerator
+          hardware. To compile this driver as a module, choose M here. The
+          module will be called qcrypto.
+
 endif # CRYPTO_HW
diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile
index f996ed72569c..3924f93d5774 100644
--- a/drivers/crypto/Makefile
+++ b/drivers/crypto/Makefile
@@ -24,3 +24,4 @@ obj-$(CONFIG_CRYPTO_DEV_SAHARA) += sahara.o
 obj-$(CONFIG_CRYPTO_DEV_TALITOS) += talitos.o
 obj-$(CONFIG_CRYPTO_DEV_UX500) += ux500/
 obj-$(CONFIG_CRYPTO_DEV_QAT) += qat/
+obj-$(CONFIG_CRYPTO_DEV_QCE) += qce/
diff --git a/drivers/crypto/qce/Makefile b/drivers/crypto/qce/Makefile
new file mode 100644
index 000000000000..348dc3173afa
--- /dev/null
+++ b/drivers/crypto/qce/Makefile
@@ -0,0 +1,6 @@
+obj-$(CONFIG_CRYPTO_DEV_QCE) += qcrypto.o
+qcrypto-objs := core.o \
+                common.o \
+                dma.o \
+                sha.o \
+                ablkcipher.o