Merge remote-tracking branch 'ixp4xx/next'

Conflicts:
	arch/arm/mach-ixp4xx/common.c
	arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h

diff --combined drivers/char/hw_random/Kconfig
index fbd9b2b850ef1de0a84a57182ff79bdd38064896,c9b95064540ce3c958c8216777dfae118c499cc7..c58ea9b80b1a3b63e65a52236d71c8db4cfa02c4
--- 1/drivers/char/hw_random/Kconfig
--- 2/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@@ -127,12 -127,12 +127,12 @@@ config HW_RANDOM_VI
          If unsure, say Y.
  
  config HW_RANDOM_IXP4XX
-       tristate "Intel IXP4xx NPU HW Random Number Generator support"
+       tristate "Intel IXP4xx NPU HW Pseudo-Random Number Generator support"
        depends on HW_RANDOM && ARCH_IXP4XX
        default HW_RANDOM
        ---help---
-         This driver provides kernel-side support for the Random
-         Number Generator hardware found on the Intel IXP4xx NPU.
+         This driver provides kernel-side support for the Pseudo-Random
+         Number Generator hardware found on the Intel IXP45x/46x NPU.
  
          To compile this driver as a module, choose M here: the
          module will be called ixp4xx-rng.
@@@ -289,16 -289,3 +289,16 @@@ config HW_RANDOM_EXYNO
          module will be called exynos-rng.
  
          If unsure, say Y.
 +
 +config HW_RANDOM_TPM
 +      tristate "TPM HW Random Number Generator support"
 +      depends on HW_RANDOM && TCG_TPM
 +      default HW_RANDOM
 +      ---help---
 +        This driver provides kernel-side support for the Random Number
 +        Generator in the Trusted Platform Module
 +
 +        To compile this driver as a module, choose M here: the
 +        module will be called tpm-rng.
 +
 +        If unsure, say Y.

diff --combined drivers/crypto/Kconfig
index 308c7fb92a60b25a27d92ef11a9acbe80f23b921,68ba9b717a07f7608f7820c799b87ddfb51f0d6b..f6644f59fd9da1042cec58487791f689d7ed127a
--- 1/drivers/crypto/Kconfig
--- 2/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@@ -224,7 -224,7 +224,7 @@@ config CRYPTO_DEV_TALITO
  
  config CRYPTO_DEV_IXP4XX
        tristate "Driver for IXP4xx crypto hardware acceleration"
-       depends on ARCH_IXP4XX
+       depends on ARCH_IXP4XX && IXP4XX_QMGR && IXP4XX_NPE
        select CRYPTO_DES
        select CRYPTO_ALGAPI
        select CRYPTO_AUTHENC
@@@ -298,15 -298,21 +298,15 @@@ config CRYPTO_DEV_TEGRA_AE
          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"
@@@ -334,7 -340,7 +334,7 @@@ config CRYPTO_DEV_ATMEL_AE
        select CRYPTO_AES
        select CRYPTO_ALGAPI
        select CRYPTO_BLKCIPHER
 -      select CONFIG_AT_HDMAC
 +      select AT_HDMAC
        help
          Some Atmel processors have AES hw accelerator.
          Select this if you want to use the Atmel module for