Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
[platform/kernel/linux-exynos.git] / arch / arm / mach-omap2 / common.h
index 64e44d6..3933b8a 100644 (file)
@@ -35,6 +35,7 @@
 #include <linux/irqchip/irq-omap-intc.h>
 
 #include <asm/proc-fns.h>
+#include <asm/hardware/cache-l2x0.h>
 
 #include "i2c.h"
 #include "serial.h"
@@ -94,11 +95,18 @@ extern void omap3_gptimer_timer_init(void);
 extern void omap4_local_timer_init(void);
 #ifdef CONFIG_CACHE_L2X0
 int omap_l2_cache_init(void);
+#define OMAP_L2C_AUX_CTRL      (L2C_AUX_CTRL_SHARED_OVERRIDE | \
+                                L310_AUX_CTRL_DATA_PREFETCH | \
+                                L310_AUX_CTRL_INSTR_PREFETCH)
+void omap4_l2c310_write_sec(unsigned long val, unsigned reg);
 #else
 static inline int omap_l2_cache_init(void)
 {
        return 0;
 }
+
+#define OMAP_L2C_AUX_CTRL      0
+#define omap4_l2c310_write_sec NULL
 #endif
 extern void omap5_realtime_timer_init(void);