diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-03-19 08:16:36 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-05-29 19:50:02 -0400 |
commit | 2edb89cd8e915d2d826f5704b80da28bde688051 (patch) | |
tree | 569f8000d9d528e274f108b31ea14cd0e9c3b188 /arch/arm/mach-shmobile | |
parent | 2a2d2fff1d0bdf0723ebd2b867509dbf89a74846 (diff) |
ARM: l2c: shmobile: remove cache size override
The cache size should already be present in the L2 cache auxiliary
control register: it is part of the integration process to configure
the hardware IP. Most platforms get this right, yet still many
cargo-cult program, and assume that they always need specifying to
the L2 cache code. Remove them so we can find out which really need
this.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-shmobile')
-rw-r--r-- | arch/arm/mach-shmobile/board-armadillo800eva-reference.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/board-armadillo800eva.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/board-kzm9g-reference.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/board-kzm9g.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/setup-r8a7778.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/setup-r8a7779.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c index 34e7f3c17dd2..39e11f48e8bc 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c | |||
@@ -165,7 +165,7 @@ static void __init eva_init(void) | |||
165 | 165 | ||
166 | #ifdef CONFIG_CACHE_L2X0 | 166 | #ifdef CONFIG_CACHE_L2X0 |
167 | /* Shared attribute override enable, 32K*8way */ | 167 | /* Shared attribute override enable, 32K*8way */ |
168 | l2x0_init(IOMEM(0xf0002000), 0x00440000, 0xc2000fff); | 168 | l2x0_init(IOMEM(0xf0002000), 0x00400000, 0xc20f0fff); |
169 | #endif | 169 | #endif |
170 | 170 | ||
171 | r8a7740_add_standard_devices_dt(); | 171 | r8a7740_add_standard_devices_dt(); |
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c index a01f867227ac..f8e25fd29b79 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c | |||
@@ -1272,7 +1272,7 @@ static void __init eva_init(void) | |||
1272 | 1272 | ||
1273 | #ifdef CONFIG_CACHE_L2X0 | 1273 | #ifdef CONFIG_CACHE_L2X0 |
1274 | /* Shared attribute override enable, 32K*8way */ | 1274 | /* Shared attribute override enable, 32K*8way */ |
1275 | l2x0_init(IOMEM(0xf0002000), 0x00440000, 0xc2000fff); | 1275 | l2x0_init(IOMEM(0xf0002000), 0x00400000, 0xc20f0fff); |
1276 | #endif | 1276 | #endif |
1277 | 1277 | ||
1278 | i2c_register_board_info(0, i2c0_devices, ARRAY_SIZE(i2c0_devices)); | 1278 | i2c_register_board_info(0, i2c0_devices, ARRAY_SIZE(i2c0_devices)); |
diff --git a/arch/arm/mach-shmobile/board-kzm9g-reference.c b/arch/arm/mach-shmobile/board-kzm9g-reference.c index 85873f186d77..a735a1d80c28 100644 --- a/arch/arm/mach-shmobile/board-kzm9g-reference.c +++ b/arch/arm/mach-shmobile/board-kzm9g-reference.c | |||
@@ -37,7 +37,7 @@ static void __init kzm_init(void) | |||
37 | 37 | ||
38 | #ifdef CONFIG_CACHE_L2X0 | 38 | #ifdef CONFIG_CACHE_L2X0 |
39 | /* Shared attribute override enable, 64K*8way */ | 39 | /* Shared attribute override enable, 64K*8way */ |
40 | l2x0_init(IOMEM(0xf0100000), 0x00460000, 0xc2000fff); | 40 | l2x0_init(IOMEM(0xf0100000), 0x00400000, 0xc20f0fff); |
41 | #endif | 41 | #endif |
42 | } | 42 | } |
43 | 43 | ||
diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c index ea9bf39fdc10..f94ec8ca42c1 100644 --- a/arch/arm/mach-shmobile/board-kzm9g.c +++ b/arch/arm/mach-shmobile/board-kzm9g.c | |||
@@ -877,7 +877,7 @@ static void __init kzm_init(void) | |||
877 | 877 | ||
878 | #ifdef CONFIG_CACHE_L2X0 | 878 | #ifdef CONFIG_CACHE_L2X0 |
879 | /* Shared attribute override enable, 64K*8way */ | 879 | /* Shared attribute override enable, 64K*8way */ |
880 | l2x0_init(IOMEM(0xf0100000), 0x00460000, 0xc2000fff); | 880 | l2x0_init(IOMEM(0xf0100000), 0x00400000, 0xc20f0fff); |
881 | #endif | 881 | #endif |
882 | 882 | ||
883 | i2c_register_board_info(0, i2c0_devices, ARRAY_SIZE(i2c0_devices)); | 883 | i2c_register_board_info(0, i2c0_devices, ARRAY_SIZE(i2c0_devices)); |
diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c index 3a8e5316671e..6dd7ddf88741 100644 --- a/arch/arm/mach-shmobile/setup-r8a7778.c +++ b/arch/arm/mach-shmobile/setup-r8a7778.c | |||
@@ -301,7 +301,7 @@ void __init r8a7778_add_dt_devices(void) | |||
301 | * Shared attribute override enable, 64K*16way | 301 | * Shared attribute override enable, 64K*16way |
302 | * don't call iounmap(base) | 302 | * don't call iounmap(base) |
303 | */ | 303 | */ |
304 | l2x0_init(base, 0x00470000, 0xc2000fff); | 304 | l2x0_init(base, 0x00400000, 0xc20f0fff); |
305 | } | 305 | } |
306 | #endif | 306 | #endif |
307 | 307 | ||
diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c index 91c90bf0ae83..a6630fccfc45 100644 --- a/arch/arm/mach-shmobile/setup-r8a7779.c +++ b/arch/arm/mach-shmobile/setup-r8a7779.c | |||
@@ -701,7 +701,7 @@ void __init r8a7779_add_standard_devices(void) | |||
701 | { | 701 | { |
702 | #ifdef CONFIG_CACHE_L2X0 | 702 | #ifdef CONFIG_CACHE_L2X0 |
703 | /* Shared attribute override enable, 64K*16way */ | 703 | /* Shared attribute override enable, 64K*16way */ |
704 | l2x0_init(IOMEM(0xf0100000), 0x00470000, 0xc2000fff); | 704 | l2x0_init(IOMEM(0xf0100000), 0x00400000, 0xc20f0fff); |
705 | #endif | 705 | #endif |
706 | r8a7779_pm_init(); | 706 | r8a7779_pm_init(); |
707 | 707 | ||