Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / include / asm / hardware / cache-l2x0.h

diff --git a/arch/arm/include/asm/hardware/cache-l2x0.h b/arch/arm/include/asm/hardware/cache-l2x0.h
index cc42d5fdee17155e920d77ed753074aee0ade487..16bd48031583da44b7c0f25c68027fd787dc3fe1 100644 (file)
--- a/arch/arm/include/asm/hardware/cache-l2x0.h
+++ b/arch/arm/include/asm/hardware/cache-l2x0.h
@@ -36,6 +36,7 @@
 #define L2X0_RAW_INTR_STAT             0x21C
 #define L2X0_INTR_CLEAR                        0x220
 #define L2X0_CACHE_SYNC                        0x730
+#define L2X0_DUMMY_REG                 0x740
 #define L2X0_INV_LINE_PA               0x770
 #define L2X0_INV_WAY                   0x77C
 #define L2X0_CLEAN_LINE_PA             0x7B0
@@ -59,7 +60,17 @@
 #define L2X0_CACHE_ID_PART_MASK                (0xf << 6)
 #define L2X0_CACHE_ID_PART_L210                (1 << 6)
 #define L2X0_CACHE_ID_PART_L310                (3 << 6)
-#define L2X0_AUX_CTRL_WAY_SIZE_MASK    (0x3 << 17)
+
+#define L2X0_AUX_CTRL_MASK                     0xc0000fff
+#define L2X0_AUX_CTRL_ASSOCIATIVITY_SHIFT      16
+#define L2X0_AUX_CTRL_WAY_SIZE_SHIFT           17
+#define L2X0_AUX_CTRL_WAY_SIZE_MASK            (0x3 << 17)
+#define L2X0_AUX_CTRL_SHARE_OVERRIDE_SHIFT     22
+#define L2X0_AUX_CTRL_NS_LOCKDOWN_SHIFT                26
+#define L2X0_AUX_CTRL_NS_INT_CTRL_SHIFT                27
+#define L2X0_AUX_CTRL_DATA_PREFETCH_SHIFT      28
+#define L2X0_AUX_CTRL_INSTR_PREFETCH_SHIFT     29
+#define L2X0_AUX_CTRL_EARLY_BRESP_SHIFT                30
 
 #ifndef __ASSEMBLY__
 extern void __init l2x0_init(void __iomem *base, __u32 aux_val, __u32 aux_mask);