5 files changed, 29 insertions, 16 deletions

diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index db27c82e0542..2d9150a1c2ba 100644
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
@@ -487,7 +487,8 @@ CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_LZO=m
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_NX=m
+CONFIG_CRYPTO_DEV_NX=y
+CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM_BOOK3S_64=m
 CONFIG_KVM_BOOK3S_64_HV=y
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index 1f65b3c9b59a..9f4a9368f51b 100644
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
@@ -369,7 +369,8 @@ CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_LZO=m
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_NX=m
+CONFIG_CRYPTO_DEV_NX=y
+CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM_BOOK3S_64=m
 CONFIG_KVM_BOOK3S_64_HV=y
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 7d74d092aa8f..662588a1c41b 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -298,21 +298,15 @@ config CRYPTO_DEV_TEGRA_AES
           will be called tegra-aes.
 
 config CRYPTO_DEV_NX
-        tristate "Support for Power7+ in-Nest cryptographic acceleration"
+        bool "Support for IBM Power7+ in-Nest cryptographic acceleration"
         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
+        default n
         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.
+          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"
diff --git a/drivers/crypto/nx/Kconfig b/drivers/crypto/nx/Kconfig
new file mode 100644
index 000000000000..dedde535024e
--- /dev/null
+++ b/drivers/crypto/nx/Kconfig
@@ -0,0 +1,17 @@
+config CRYPTO_DEV_NX_ENCRYPT
+        tristate "Encryption acceleration support"
+        depends on PPC64 && IBMVIO
+        default y
+        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 encryption acceleration. This
+          module supports acceleration for AES and SHA2 algorithms. If you
+          choose 'M' here, this module will be called nx_crypto.
diff --git a/drivers/crypto/nx/Makefile b/drivers/crypto/nx/Makefile
index 411ce59c80d1..7f110e460da3 100644
--- a/drivers/crypto/nx/Makefile
+++ b/drivers/crypto/nx/Makefile
@@ -1,4 +1,4 @@
-obj-$(CONFIG_CRYPTO_DEV_NX) += nx-crypto.o
+obj-$(CONFIG_CRYPTO_DEV_NX_ENCRYPT) += nx-crypto.o
 nx-crypto-objs := nx.o \
                   nx_debugfs.o \
                   nx-aes-cbc.o \