Merge branches 'alignment', 'fixes', 'l2c' (early part) and 'misc' into for-next

[karo-tx-linux.git] / arch / arm / mach-realview / realview_pb1176.c

diff --git a/arch/arm/mach-realview/realview_pb1176.c b/arch/arm/mach-realview/realview_pb1176.c
index 6abf6a037b9e4937306ec9922a7eb494ff11c69b..aad9c5a40d47b2bb1e602a232226d2e5f98e91df 100644 (file)
--- a/arch/arm/mach-realview/realview_pb1176.c
+++ b/arch/arm/mach-realview/realview_pb1176.c
@@ -353,7 +353,13 @@ static void __init realview_pb1176_init(void)
        int i;
 
 #ifdef CONFIG_CACHE_L2X0
-       /* 128Kb (16Kb/way) 8-way associativity. evmon/parity/share enabled. */
+       /*
+        * The PL220 needs to be manually configured as the hardware
+        * doesn't report the correct sizes.
+        * 128kB (16kB/way), 8-way associativity, event monitor and
+        * parity enabled, ignore share bit, no force write allocate
+        * Bits:  .... ...0 0111 0011 0000 .... .... ....
+        */
        l2x0_init(__io_address(REALVIEW_PB1176_L220_BASE), 0x00730000, 0xfe000fff);
 #endif