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

Commit 4082cfa7 authored by Sascha Hauer's avatar Sascha Hauer Committed by Russell King
Browse files

ARM: 6210/1: Do not rely on reset defaults of L2X0_AUX_CTRL 



On i.MX35 the L2X0_AUX_CTRL register does not have sensible reset
default values. Allow them to be overwritten with the aux_val/aux_mask
arguments passed to l2x0_init().

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent e467e104

arch/arm/mm/cache-l2x0.c

+3 −2
Original line number Diff line number Diff line
@@ -218,6 +218,9 @@ void __init l2x0_init(void __iomem *base, __u32 aux_val, __u32 aux_mask) 
	cache_id = readl(l2x0_base + L2X0_CACHE_ID);

	aux = readl(l2x0_base + L2X0_AUX_CTRL);



	aux &= aux_mask;

	aux |= aux_val;



	/* Determine the number of ways */

	switch (cache_id & L2X0_CACHE_ID_PART_MASK) {

	case L2X0_CACHE_ID_PART_L310:
@@ -248,8 +251,6 @@ void __init l2x0_init(void __iomem *base, __u32 aux_val, __u32 aux_mask) 
	if (!(readl(l2x0_base + L2X0_CTRL) & 1)) {



		/* l2x0 controller is disabled */

		aux &= aux_mask;

		aux |= aux_val;

		writel(aux, l2x0_base + L2X0_AUX_CTRL);



		l2x0_inv_all();