projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.denx.de/u-boot-fsl-qoriq
[oweals/u-boot.git]
/
arch
/
arm
/
imx-common
/
cache.c
diff --git
a/arch/arm/imx-common/cache.c
b/arch/arm/imx-common/cache.c
index 54b021cfede98eeb3f74fb66d629a8b5a6f445fa..b77548821dbbbea8909e395b6c56967bc6c08b5f 100644
(file)
--- a/
arch/arm/imx-common/cache.c
+++ b/
arch/arm/imx-common/cache.c
@@
-42,6
+42,12
@@
void v7_outer_cache_enable(void)
unsigned int val;
unsigned int val;
+ /*
+ * Must disable the L2 before changing the latency parameters
+ * and auxiliary control register.
+ */
+ clrbits_le32(&pl310->pl310_ctrl, L2X0_CTRL_EN);
+
/*
* Set bit 22 in the auxiliary control register. If this bit
* is cleared, PL310 treats Normal Shared Non-cacheable
/*
* Set bit 22 in the auxiliary control register. If this bit
* is cleared, PL310 treats Normal Shared Non-cacheable
@@
-59,9
+65,6
@@
void v7_outer_cache_enable(void)
}
#endif
}
#endif
- /* Must disable the L2 before changing the latency parameters */
- clrbits_le32(&pl310->pl310_ctrl, L2X0_CTRL_EN);
-
writel(0x132, &pl310->pl310_tag_latency_ctrl);
writel(0x132, &pl310->pl310_data_latency_ctrl);
writel(0x132, &pl310->pl310_tag_latency_ctrl);
writel(0x132, &pl310->pl310_data_latency_ctrl);