summaryrefslogtreecommitdiffstats
path: root/arch/arm/include
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2016-04-08 13:37:28 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2016-04-08 13:37:28 +0200
commit0d3f88a6dbe59bced2530e69d241f569be58cf3c (patch)
treeae94772c93de515e888f15de1f48d9217039a6d0 /arch/arm/include
parentca275c3ef10906d1cd5c7d40ab78b2fad0a0c181 (diff)
parentf546a50feb861c4264892b2089f8e0cff9b6f68e (diff)
downloadbarebox-0d3f88a6dbe59bced2530e69d241f569be58cf3c.tar.gz
barebox-0d3f88a6dbe59bced2530e69d241f569be58cf3c.tar.xz
Merge branch 'for-next/imx'
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/cache-l2x0.h8
-rw-r--r--arch/arm/include/asm/errata.h9
2 files changed, 17 insertions, 0 deletions
diff --git a/arch/arm/include/asm/cache-l2x0.h b/arch/arm/include/asm/cache-l2x0.h
index 963dd99f64..9bb245b0be 100644
--- a/arch/arm/include/asm/cache-l2x0.h
+++ b/arch/arm/include/asm/cache-l2x0.h
@@ -56,6 +56,14 @@
#define L2X0_LINE_TAG 0xF30
#define L2X0_DEBUG_CTRL 0xF40
#define L2X0_PREFETCH_CTRL 0xF60
+#define L2X0_DOUBLE_LINEFILL_EN (1 << 30)
+#define L2X0_INSTRUCTION_PREFETCH_EN (1 << 29)
+#define L2X0_DATA_PREFETCH_EN (1 << 28)
+#define L2X0_DOUBLE_LINEFILL_ON_WRAP_READ_DIS (1 << 27)
+#define L2X0_PREFETCH_DROP_EN (1 << 24)
+#define L2X0_INCR_DOUBLE_LINEFILL_EN (1 << 23)
+#define L2X0_ESCLUSIVE_SEQUENCE_EN (1 << 21)
+
#define L2X0_POWER_CTRL 0xF80
#define L2X0_DYNAMIC_CLK_GATING_EN (1 << 1)
#define L2X0_STNDBY_MODE_EN (1 << 0)
diff --git a/arch/arm/include/asm/errata.h b/arch/arm/include/asm/errata.h
index 9525823e4c..98137b557f 100644
--- a/arch/arm/include/asm/errata.h
+++ b/arch/arm/include/asm/errata.h
@@ -77,3 +77,12 @@ static inline void enable_arm_errata_794072_war(void)
"mcr p15, 0, r0, c15, c0, 1\n"
);
}
+
+static inline void enable_arm_errata_845369_war(void)
+{
+ __asm__ __volatile__ (
+ "mrc p15, 0, r0, c15, c0, 1\n"
+ "orr r0, r0, #1 << 22\n"
+ "mcr p15, 0, r0, c15, c0, 1\n"
+ );
+}