Merge tag 'firmware-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[uclinux-h8/linux.git] / arch / arm / mach-bcm / board_bcm.c

diff --git a/arch/arm/mach-bcm/board_bcm.c b/arch/arm/mach-bcm/board_bcm.c
index 2595935..22e8421 100644 (file)
--- a/arch/arm/mach-bcm/board_bcm.c
+++ b/arch/arm/mach-bcm/board_bcm.c
@@ -20,12 +20,35 @@
 
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
+#include <asm/hardware/cache-l2x0.h>
 
 
+#include "bcm_kona_smc.h"
+
+static int __init kona_l2_cache_init(void)
+{
+       if (!IS_ENABLED(CONFIG_CACHE_L2X0))
+               return 0;
+
+       bcm_kona_smc(SSAPI_ENABLE_L2_CACHE, 0, 0, 0, 0);
+
+       /*
+        * The aux_val and aux_mask have no effect since L2 cache is already
+        * enabled.  Pass 0s for aux_val and 1s for aux_mask for default value.
+        */
+       l2x0_of_init(0, ~0);
+
+       return 0;
+}
+
 static void __init board_init(void)
 {
        of_platform_populate(NULL, of_default_bus_match_table, NULL,
                &platform_bus);
+
+       bcm_kona_smc_init();
+
+       kona_l2_cache_init();
 }
 
 static const char * const bcm11351_dt_compat[] = { "bcm,bcm11351", NULL, };