From: David Jander Date: Thu, 14 Jul 2011 03:58:57 +0000 (+0000) Subject: ARM: MX5: Fix broken leftover TO-2 errata workaround X-Git-Tag: v2011.09-rc1~219^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6e25b6ce5d26c3c238c1dd947ef33dc38be003d8;p=karo-tx-uboot.git ARM: MX5: Fix broken leftover TO-2 errata workaround This check was broken. r3 does not contain the silicon revision anymore, so we need to reload it. Also, this errata only applies to i.MX51. Signed-off-by: David Jander Acked-by: Stefano Babic --- diff --git a/arch/arm/cpu/armv7/mx5/lowlevel_init.S b/arch/arm/cpu/armv7/mx5/lowlevel_init.S index 96ebfe2345..94de9f1d61 100644 --- a/arch/arm/cpu/armv7/mx5/lowlevel_init.S +++ b/arch/arm/cpu/armv7/mx5/lowlevel_init.S @@ -39,10 +39,14 @@ orr r0, r0, #(1 << 23) /* disable write allocate combine */ orr r0, r0, #(1 << 22) /* disable write allocate */ - cmp r3, #0x10 /* r3 contains the silicon rev */ +#if defined(CONFIG_MX51) + ldr r1, =0x0 + ldr r3, [r1, #ROM_SI_REV] + cmp r3, #0x10 /* disable write combine for TO 2 and lower revs */ orrls r0, r0, #(1 << 25) +#endif mcr 15, 1, r0, c9, c0, 2 .endm /* init_l2cc */