aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-realview/Kconfig3
-rw-r--r--arch/arm/mach-realview/realview_eb.c2
-rw-r--r--arch/arm/mach-realview/realview_pb1176.c2
-rw-r--r--arch/arm/mach-realview/realview_pb11mp.c2
-rw-r--r--arch/arm/mm/Kconfig6
5 files changed, 11 insertions, 4 deletions
diff --git a/arch/arm/mach-realview/Kconfig b/arch/arm/mach-realview/Kconfig
index eba1a8ce7354..5ccde7cf39e8 100644
--- a/arch/arm/mach-realview/Kconfig
+++ b/arch/arm/mach-realview/Kconfig
@@ -10,7 +10,6 @@ config MACH_REALVIEW_EB
10config REALVIEW_EB_ARM11MP 10config REALVIEW_EB_ARM11MP
11 bool "Support ARM11MPCore tile" 11 bool "Support ARM11MPCore tile"
12 depends on MACH_REALVIEW_EB 12 depends on MACH_REALVIEW_EB
13 select CACHE_L2X0
14 help 13 help
15 Enable support for the ARM11MPCore tile on the Realview platform. 14 Enable support for the ARM11MPCore tile on the Realview platform.
16 15
@@ -27,7 +26,6 @@ config REALVIEW_EB_ARM11MP_REVB
27config MACH_REALVIEW_PB11MP 26config MACH_REALVIEW_PB11MP
28 bool "Support RealView/PB11MPCore platform" 27 bool "Support RealView/PB11MPCore platform"
29 select ARM_GIC 28 select ARM_GIC
30 select CACHE_L2X0
31 help 29 help
32 Include support for the ARM(R) RealView MPCore Platform Baseboard. 30 Include support for the ARM(R) RealView MPCore Platform Baseboard.
33 PB11MPCore is a platform with an on-board ARM11MPCore and has 31 PB11MPCore is a platform with an on-board ARM11MPCore and has
@@ -36,7 +34,6 @@ config MACH_REALVIEW_PB11MP
36config MACH_REALVIEW_PB1176 34config MACH_REALVIEW_PB1176
37 bool "Support RealView/PB1176 platform" 35 bool "Support RealView/PB1176 platform"
38 select ARM_GIC 36 select ARM_GIC
39 select CACHE_L2X0
40 help 37 help
41 Include support for the ARM(R) RealView ARM1176 Platform Baseboard. 38 Include support for the ARM(R) RealView ARM1176 Platform Baseboard.
42 39
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c
index 247b55620477..5782d83fd886 100644
--- a/arch/arm/mach-realview/realview_eb.c
+++ b/arch/arm/mach-realview/realview_eb.c
@@ -365,9 +365,11 @@ static void __init realview_eb_init(void)
365 if (core_tile_eb11mp()) { 365 if (core_tile_eb11mp()) {
366 realview_eb11mp_fixup(); 366 realview_eb11mp_fixup();
367 367
368#ifdef CONFIG_CACHE_L2X0
368 /* 1MB (128KB/way), 8-way associativity, evmon/parity/share enabled 369 /* 1MB (128KB/way), 8-way associativity, evmon/parity/share enabled
369 * Bits: .... ...0 0111 1001 0000 .... .... .... */ 370 * Bits: .... ...0 0111 1001 0000 .... .... .... */
370 l2x0_init(__io_address(REALVIEW_EB11MP_L220_BASE), 0x00790000, 0xfe000fff); 371 l2x0_init(__io_address(REALVIEW_EB11MP_L220_BASE), 0x00790000, 0xfe000fff);
372#endif
371 } 373 }
372 374
373 clk_register(&realview_clcd_clk); 375 clk_register(&realview_clcd_clk);
diff --git a/arch/arm/mach-realview/realview_pb1176.c b/arch/arm/mach-realview/realview_pb1176.c
index 4e6731098e5b..cf7f576a5860 100644
--- a/arch/arm/mach-realview/realview_pb1176.c
+++ b/arch/arm/mach-realview/realview_pb1176.c
@@ -260,8 +260,10 @@ static void __init realview_pb1176_init(void)
260{ 260{
261 int i; 261 int i;
262 262
263#ifdef CONFIG_CACHE_L2X0
263 /* 128Kb (16Kb/way) 8-way associativity. evmon/parity/share enabled. */ 264 /* 128Kb (16Kb/way) 8-way associativity. evmon/parity/share enabled. */
264 l2x0_init(__io_address(REALVIEW_PB1176_L220_BASE), 0x00730000, 0xfe000fff); 265 l2x0_init(__io_address(REALVIEW_PB1176_L220_BASE), 0x00730000, 0xfe000fff);
266#endif
265 267
266 clk_register(&realview_clcd_clk); 268 clk_register(&realview_clcd_clk);
267 269
diff --git a/arch/arm/mach-realview/realview_pb11mp.c b/arch/arm/mach-realview/realview_pb11mp.c
index 7d1fa1fad5e4..f7ce1c5a178a 100644
--- a/arch/arm/mach-realview/realview_pb11mp.c
+++ b/arch/arm/mach-realview/realview_pb11mp.c
@@ -306,9 +306,11 @@ static void __init realview_pb11mp_init(void)
306{ 306{
307 int i; 307 int i;
308 308
309#ifdef CONFIG_CACHE_L2X0
309 /* 1MB (128KB/way), 8-way associativity, evmon/parity/share enabled 310 /* 1MB (128KB/way), 8-way associativity, evmon/parity/share enabled
310 * Bits: .... ...0 0111 1001 0000 .... .... .... */ 311 * Bits: .... ...0 0111 1001 0000 .... .... .... */
311 l2x0_init(__io_address(REALVIEW_TC11MP_L220_BASE), 0x00790000, 0xfe000fff); 312 l2x0_init(__io_address(REALVIEW_TC11MP_L220_BASE), 0x00790000, 0xfe000fff);
313#endif
312 314
313 clk_register(&realview_clcd_clk); 315 clk_register(&realview_clcd_clk);
314 316
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index f405435fe64e..3696f4fe45de 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -701,5 +701,9 @@ config OUTER_CACHE
701 default n 701 default n
702 702
703config CACHE_L2X0 703config CACHE_L2X0
704 bool 704 bool "Enable the L2x0 outer cache controller"
705 depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176
706 default y
705 select OUTER_CACHE 707 select OUTER_CACHE
708 help
709 This option enables the L2x0 PrimeCell.