3 files changed, 29 insertions, 0 deletions

diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 159e94f4b22..950d1f7a5a3 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -149,6 +149,7 @@ core-$(CONFIG_KVM) 		+= arch/powerpc/kvm/
 core-$(CONFIG_PERF_EVENTS)      += arch/powerpc/perf/
 
 drivers-$(CONFIG_OPROFILE)      += arch/powerpc/oprofile/
+drivers-$(CONFIG_CRYPTO_DEV_NX) += drivers/crypto/nx/
 
 # Default to zImage, override when needed
 all: zImage
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index ab9abb46d01..4319248761d 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -295,4 +295,21 @@ config CRYPTO_DEV_TEGRA_AES
           To compile this driver as a module, choose M here: the module
           will be called tegra-aes.
 
+config CRYPTO_DEV_NX
+        tristate "Support for Power7+ in-Nest cryptographic accleration"
+        depends on PPC64 && IBMVIO
+        select CRYPTO_AES
+        select CRYPTO_CBC
+        select CRYPTO_ECB
+        select CRYPTO_CCM
+        select CRYPTO_GCM
+        select CRYPTO_AUTHENC
+        select CRYPTO_XCBC
+        select CRYPTO_SHA256
+        select CRYPTO_SHA512
+        help
+          Support for Power7+ in-Nest cryptographic acceleration. This
+          module supports acceleration for AES and SHA2 algorithms. If you
+          choose 'M' here, this module will be called nx_crypto.
+
 endif # CRYPTO_HW
diff --git a/drivers/crypto/nx/Makefile b/drivers/crypto/nx/Makefile
new file mode 100644
index 00000000000..411ce59c80d
--- /dev/null
+++ b/drivers/crypto/nx/Makefile
@@ -0,0 +1,11 @@
+obj-$(CONFIG_CRYPTO_DEV_NX) += nx-crypto.o
+nx-crypto-objs := nx.o \
+                  nx_debugfs.o \
+                  nx-aes-cbc.o \
+                  nx-aes-ecb.o \
+                  nx-aes-gcm.o \
+                  nx-aes-ccm.o \
+                  nx-aes-ctr.o \
+                  nx-aes-xcbc.o \
+                  nx-sha256.o \
+                  nx-sha512.o