Merge tag 'v3.6-rc4'

Merge 3.6-rc4 to get latest OMAP and device tree fixes.

1 files changed, 46 insertions, 0 deletions

diff --git a/drivers/crypto/atmel-sha-regs.h b/drivers/crypto/atmel-sha-regs.h
new file mode 100644
index 000000000000..dc53a20d7da1
--- /dev/null
+++ b/drivers/crypto/atmel-sha-regs.h
@@ -0,0 +1,46 @@
+#ifndef __ATMEL_SHA_REGS_H__
+#define __ATMEL_SHA_REGS_H__
+
+#define SHA_REG_DIGEST(x)               (0x80 + ((x) * 0x04))
+#define SHA_REG_DIN(x)                  (0x40 + ((x) * 0x04))
+
+#define SHA_CR                          0x00
+#define SHA_CR_START                    (1 << 0)
+#define SHA_CR_FIRST                    (1 << 4)
+#define SHA_CR_SWRST                    (1 << 8)
+
+#define SHA_MR                          0x04
+#define SHA_MR_MODE_MASK                (0x3 << 0)
+#define SHA_MR_MODE_MANUAL              0x0
+#define SHA_MR_MODE_AUTO                0x1
+#define SHA_MR_MODE_PDC                 0x2
+#define SHA_MR_DUALBUFF                 (1 << 3)
+#define SHA_MR_PROCDLY                  (1 << 4)
+#define SHA_MR_ALGO_SHA1                (0 << 8)
+#define SHA_MR_ALGO_SHA256              (1 << 8)
+
+#define SHA_IER                         0x10
+#define SHA_IDR                         0x14
+#define SHA_IMR                         0x18
+#define SHA_ISR                         0x1C
+#define SHA_INT_DATARDY                 (1 << 0)
+#define SHA_INT_ENDTX                   (1 << 1)
+#define SHA_INT_TXBUFE                  (1 << 2)
+#define SHA_INT_URAD                    (1 << 8)
+#define SHA_ISR_URAT_MASK               (0x7 << 12)
+#define SHA_ISR_URAT_IDR                (0x0 << 12)
+#define SHA_ISR_URAT_ODR                (0x1 << 12)
+#define SHA_ISR_URAT_MR                 (0x2 << 12)
+#define SHA_ISR_URAT_WO                 (0x5 << 12)
+
+#define SHA_TPR                         0x108
+#define SHA_TCR                         0x10C
+#define SHA_TNPR                        0x118
+#define SHA_TNCR                        0x11C
+#define SHA_PTCR                        0x120
+#define SHA_PTCR_TXTEN          (1 << 8)
+#define SHA_PTCR_TXTDIS         (1 << 9)
+#define SHA_PTSR                        0x124
+#define SHA_PTSR_TXTEN          (1 << 8)
+
+#endif /* __ATMEL_SHA_REGS_H__ */