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

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-realview / realview_eb.c

diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c
index c85ddb2a0ad09083e3e3c30901bc28bb3c807af2..b575895037b8f7f887c5962d43df84b1cc5da8d9 100644 (file)
--- a/arch/arm/mach-realview/realview_eb.c
+++ b/arch/arm/mach-realview/realview_eb.c
@@ -442,8 +442,13 @@ static void __init realview_eb_init(void)
                realview_eb11mp_fixup();
 
 #ifdef CONFIG_CACHE_L2X0
-               /* 1MB (128KB/way), 8-way associativity, evmon/parity/share enabled
-                * Bits:  .... ...0 0111 1001 0000 .... .... .... */
+               /*
+                * The PL220 needs to be manually configured as the hardware
+                * doesn't report the correct sizes.
+                * 1MB (128KB/way), 8-way associativity, event monitor and
+                * parity enabled, ignore share bit, no force write allocate
+                * Bits:  .... ...0 0111 1001 0000 .... .... ....
+                */
                l2x0_init(__io_address(REALVIEW_EB11MP_L220_BASE), 0x00790000, 0xfe000fff);
 #endif
                platform_device_register(&pmu_device);