Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36bccb11 authored by Russell King's avatar Russell King
Browse files

ARM: l2c: remove platforms/SoCs setting early BRESP 



Since we now automatically enable early BRESP in core L2C-310 code when
we detect a Cortex-A9, we don't need platforms/SoCs to set this bit
explicitly.  Instead, they should seek to preserve the value of bit 30
in the auxiliary control register.

Acked-by: default avatarTony Lindgren <tony@atomide.com>
Acked-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 4374d649

arch/arm/mach-berlin/berlin.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ static void __init berlin_init_machine(void) 
	 * with DT probing for L2CCs, berlin_init_machine can be removed.

	 * Note: 88DE3005 (Armada 1500-mini) uses pl310 l2cc

	 */

	l2x0_of_init(0x70c00000, 0xfeffffff);

	l2x0_of_init(0x30c00000, 0xfeffffff);

	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

}

arch/arm/mach-exynos/exynos.c

+2 −2
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ 
#include "mfc.h"

#include "regs-pmu.h"



#define L2_AUX_VAL 0x7C470001

#define L2_AUX_MASK 0xC200ffff

#define L2_AUX_VAL 0x3c470001

#define L2_AUX_MASK 0xc200ffff



static struct map_desc exynos4_iodesc[] __initdata = {

	{

arch/arm/mach-omap2/omap4-common.c

+1 −2
Original line number Diff line number Diff line
@@ -204,8 +204,7 @@ static int __init omap_l2_cache_init(void) 
		   L2C_AUX_CTRL_WAY_SIZE(3) |

		   L2C_AUX_CTRL_SHARED_OVERRIDE |

		   L310_AUX_CTRL_DATA_PREFETCH |

		   L310_AUX_CTRL_INSTR_PREFETCH |

		   L310_AUX_CTRL_EARLY_BRESP;

		   L310_AUX_CTRL_INSTR_PREFETCH;



	omap_smc1(0x109, aux_ctrl);

arch/arm/mach-shmobile/board-armadillo800eva-reference.c

+2 −2
Original line number Diff line number Diff line
@@ -164,8 +164,8 @@ static void __init eva_init(void) 
	r8a7740_meram_workaround();



#ifdef CONFIG_CACHE_L2X0

	/* Early BRESP enable, Shared attribute override enable, 32K*8way */

	l2x0_init(IOMEM(0xf0002000), 0x40440000, 0x82000fff);

	/* Shared attribute override enable, 32K*8way */

	l2x0_init(IOMEM(0xf0002000), 0x00440000, 0xc2000fff);

#endif



	r8a7740_add_standard_devices_dt();

arch/arm/mach-shmobile/board-armadillo800eva.c

+2 −2
Original line number Diff line number Diff line
@@ -1271,8 +1271,8 @@ static void __init eva_init(void) 




#ifdef CONFIG_CACHE_L2X0

	/* Early BRESP enable, Shared attribute override enable, 32K*8way */

	l2x0_init(IOMEM(0xf0002000), 0x40440000, 0x82000fff);

	/* Shared attribute override enable, 32K*8way */

	l2x0_init(IOMEM(0xf0002000), 0x00440000, 0xc2000fff);

#endif



	i2c_register_board_info(0, i2c0_devices, ARRAY_SIZE(i2c0_devices));