Merge tag 'trace-fixes-v3.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / drivers / crypto / atmel-sha-regs.h

diff --git a/drivers/crypto/atmel-sha-regs.h b/drivers/crypto/atmel-sha-regs.h
index dc53a20d7da1869858fdc8e4edd2aec97c0e3d96..83b2d74256666ecff11ead015c5f07fbb8dc74f5 100644 (file)
--- a/drivers/crypto/atmel-sha-regs.h
+++ b/drivers/crypto/atmel-sha-regs.h
@@ -14,10 +14,13 @@
 #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_MR_ALGO_SHA384             (2 << 8)
+#define SHA_MR_ALGO_SHA512             (3 << 8)
+#define SHA_MR_ALGO_SHA224             (4 << 8)
+#define        SHA_MR_DUALBUFF                 (1 << 16)
 
 #define SHA_IER                                0x10
 #define SHA_IDR                                0x14
@@ -33,6 +36,8 @@
 #define SHA_ISR_URAT_MR                        (0x2 << 12)
 #define SHA_ISR_URAT_WO                        (0x5 << 12)
 
+#define        SHA_HW_VERSION          0xFC
+
 #define SHA_TPR                                0x108
 #define SHA_TCR                                0x10C
 #define SHA_TNPR                       0x118