Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto updates from Herbert Xu:
 - New cipher/hash driver for ARM ux500.
 - Code clean-up for aesni-intel.
 - Misc fixes.

Fixed up conflicts in arch/arm/mach-ux500/devices-common.h, where quite
frankly some of it made no sense at all (the pull brought in a
declaration for the dbx500_add_platform_device_noirq() function, which
neither exists nor is used anywhere).

Also some trivial add-add context conflicts in the Kconfig file in
drivers/{char/hw_random,crypto}/

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: aesni-intel - move more common code to ablk_init_common
  crypto: aesni-intel - use crypto_[un]register_algs
  crypto: ux500 - Cleanup hardware identification
  crypto: ux500 - Update DMA handling for 3.4
  mach-ux500: crypto - core support for CRYP/HASH module.
  crypto: ux500 - Add driver for HASH hardware
  crypto: ux500 - Add driver for CRYP hardware
  hwrng: Kconfig - modify default state for atmel-rng driver
  hwrng: omap - use devm_request_and_ioremap
  crypto: crypto4xx - move up err_request_irq label
  crypto, xor: Sanitize checksumming function selection output
  crypto: caam - add backward compatible string sec4.0

1 files changed, 123 insertions, 0 deletions

diff --git a/drivers/crypto/ux500/cryp/cryp_p.h b/drivers/crypto/ux500/cryp/cryp_p.h
new file mode 100644
index 000000000000..6dcffe15c2bc
--- /dev/null
+++ b/drivers/crypto/ux500/cryp/cryp_p.h
@@ -0,0 +1,123 @@
+/**
+ * Copyright (C) ST-Ericsson SA 2010
+ * Author: Shujuan Chen <shujuan.chen@stericsson.com> for ST-Ericsson.
+ * Author: Jonas Linde <jonas.linde@stericsson.com> for ST-Ericsson.
+ * Author: Joakim Bech <joakim.xx.bech@stericsson.com> for ST-Ericsson.
+ * Author: Berne Hebark <berne.herbark@stericsson.com> for ST-Ericsson.
+ * Author: Niklas Hernaeus <niklas.hernaeus@stericsson.com> for ST-Ericsson.
+ * License terms: GNU General Public License (GPL) version 2
+ */
+
+#ifndef _CRYP_P_H_
+#define _CRYP_P_H_
+
+#include <linux/io.h>
+#include <linux/bitops.h>
+
+#include "cryp.h"
+#include "cryp_irqp.h"
+
+/**
+ * Generic Macros
+ */
+#define CRYP_SET_BITS(reg_name, mask) \
+        writel_relaxed((readl_relaxed(reg_name) | mask), reg_name)
+
+#define CRYP_WRITE_BIT(reg_name, val, mask) \
+        writel_relaxed(((readl_relaxed(reg_name) & ~(mask)) |\
+                        ((val) & (mask))), reg_name)
+
+#define CRYP_TEST_BITS(reg_name, val) \
+        (readl_relaxed(reg_name) & (val))
+
+#define CRYP_PUT_BITS(reg, val, shift, mask) \
+        writel_relaxed(((readl_relaxed(reg) & ~(mask)) | \
+                (((u32)val << shift) & (mask))), reg)
+
+/**
+ * CRYP specific Macros
+ */
+#define CRYP_PERIPHERAL_ID0             0xE3
+#define CRYP_PERIPHERAL_ID1             0x05
+
+#define CRYP_PERIPHERAL_ID2_DB8500      0x28
+#define CRYP_PERIPHERAL_ID3             0x00
+
+#define CRYP_PCELL_ID0                  0x0D
+#define CRYP_PCELL_ID1                  0xF0
+#define CRYP_PCELL_ID2                  0x05
+#define CRYP_PCELL_ID3                  0xB1
+
+/**
+ * CRYP register default values
+ */
+#define MAX_DEVICE_SUPPORT              2
+
+/* Priv set, keyrden set and datatype 8bits swapped set as default. */
+#define CRYP_CR_DEFAULT                 0x0482
+#define CRYP_DMACR_DEFAULT              0x0
+#define CRYP_IMSC_DEFAULT               0x0
+#define CRYP_DIN_DEFAULT                0x0
+#define CRYP_DOUT_DEFAULT               0x0
+#define CRYP_KEY_DEFAULT                0x0
+#define CRYP_INIT_VECT_DEFAULT          0x0
+
+/**
+ * CRYP Control register specific mask
+ */
+#define CRYP_CR_SECURE_MASK             BIT(0)
+#define CRYP_CR_PRLG_MASK               BIT(1)
+#define CRYP_CR_ALGODIR_MASK            BIT(2)
+#define CRYP_CR_ALGOMODE_MASK           (BIT(5) | BIT(4) | BIT(3))
+#define CRYP_CR_DATATYPE_MASK           (BIT(7) | BIT(6))
+#define CRYP_CR_KEYSIZE_MASK            (BIT(9) | BIT(8))
+#define CRYP_CR_KEYRDEN_MASK            BIT(10)
+#define CRYP_CR_KSE_MASK                BIT(11)
+#define CRYP_CR_START_MASK              BIT(12)
+#define CRYP_CR_INIT_MASK               BIT(13)
+#define CRYP_CR_FFLUSH_MASK             BIT(14)
+#define CRYP_CR_CRYPEN_MASK             BIT(15)
+#define CRYP_CR_CONTEXT_SAVE_MASK       (CRYP_CR_SECURE_MASK |\
+                                         CRYP_CR_PRLG_MASK |\
+                                         CRYP_CR_ALGODIR_MASK |\
+                                         CRYP_CR_ALGOMODE_MASK |\
+                                         CRYP_CR_DATATYPE_MASK |\
+                                         CRYP_CR_KEYSIZE_MASK |\
+                                         CRYP_CR_KEYRDEN_MASK |\
+                                         CRYP_CR_DATATYPE_MASK)
+
+
+#define CRYP_SR_INFIFO_READY_MASK       (BIT(0) | BIT(1))
+#define CRYP_SR_IFEM_MASK               BIT(0)
+#define CRYP_SR_BUSY_MASK               BIT(4)
+
+/**
+ * Bit position used while setting bits in register
+ */
+#define CRYP_CR_PRLG_POS                1
+#define CRYP_CR_ALGODIR_POS             2
+#define CRYP_CR_ALGOMODE_POS            3
+#define CRYP_CR_DATATYPE_POS            6
+#define CRYP_CR_KEYSIZE_POS             8
+#define CRYP_CR_KEYRDEN_POS             10
+#define CRYP_CR_KSE_POS                 11
+#define CRYP_CR_START_POS               12
+#define CRYP_CR_INIT_POS                13
+#define CRYP_CR_CRYPEN_POS              15
+
+#define CRYP_SR_BUSY_POS                4
+
+/**
+ * CRYP PCRs------PC_NAND control register
+ * BIT_MASK
+ */
+#define CRYP_DMA_REQ_MASK               (BIT(1) | BIT(0))
+#define CRYP_DMA_REQ_MASK_POS           0
+
+
+struct cryp_system_context {
+        /* CRYP Register structure */
+        struct cryp_register *p_cryp_reg[MAX_DEVICE_SUPPORT];
+};
+
+#endif