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

Commit cef3d92c authored by Russell King's avatar Russell King
Browse files

ARM: l2c: omap2: remove ES1.0 support 



Santosh says:
> But we should kill all of that since we long back decided to remove
> ES1.0 related code. The mach-omap code alreasy has removed the ES1.0
> compatibility so feel free to remove any specific ES1.0
> related stuff. That silicon is long dead.

Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 03a166e2

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

+8 −17
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ static void omap4_l2x0_set_debug(unsigned long val) 


static int __init omap_l2_cache_init(void)

{

	u32 aux_ctrl = 0;

	u32 aux_ctrl;



	/*

	 * To avoid code running on other OMAPs in
@@ -196,26 +196,17 @@ static int __init omap_l2_cache_init(void) 
	if (WARN_ON(!l2cache_base))

		return -ENOMEM;



	/*

	 * 16-way associativity, parity disabled

	 * Way size - 32KB (es1.0)

	 * Way size - 64KB (es2.0 +)

	 */

	aux_ctrl = ((1 << L2X0_AUX_CTRL_ASSOCIATIVITY_SHIFT) |

	/* 16-way associativity, parity disabled, way size - 64KB (es2.0 +) */

	aux_ctrl = (1 << L2X0_AUX_CTRL_ASSOCIATIVITY_SHIFT) |

			(0x1 << 25) |

			(0x1 << L2X0_AUX_CTRL_NS_LOCKDOWN_SHIFT) |

			(0x1 << L2X0_AUX_CTRL_NS_INT_CTRL_SHIFT));



	if (omap_rev() == OMAP4430_REV_ES1_0) {

		aux_ctrl |= 0x2 << L2X0_AUX_CTRL_WAY_SIZE_SHIFT;

	} else {

		aux_ctrl |= ((0x3 << L2X0_AUX_CTRL_WAY_SIZE_SHIFT) |

			(0x1 << L2X0_AUX_CTRL_NS_INT_CTRL_SHIFT)) |

			(0x3 << L2X0_AUX_CTRL_WAY_SIZE_SHIFT) |

			(1 << L2X0_AUX_CTRL_SHARE_OVERRIDE_SHIFT) |

			(1 << L2X0_AUX_CTRL_DATA_PREFETCH_SHIFT) |

			(1 << L2X0_AUX_CTRL_INSTR_PREFETCH_SHIFT) |

			(1 << L2X0_AUX_CTRL_EARLY_BRESP_SHIFT));

	}

	if (omap_rev() != OMAP4430_REV_ES1_0)

			(1 << L2X0_AUX_CTRL_EARLY_BRESP_SHIFT);



	omap_smc1(0x109, aux_ctrl);



	/* Enable PL310 L2 Cache controller */