ARM: bcm281xx: Move kona_l2_cache_init() so it can be shared

In preparation for future SoCs, move kona_l2_cache_init() from board
specific board_bcm281xx.c to shared kona.c, so multiple SoC families
can make use of it. Also change the return type to "void", since we
never look at the return code anyway.

Signed-off-by: Markus Mayer <markus.mayer@linaro.org>
Signed-off-by: Matt Porter <mporter@linaro.org>

diff --git a/arch/arm/mach-bcm/board_bcm281xx.c b/arch/arm/mach-bcm/board_bcm281xx.c
index d8f0b6cc78aa4b15b43b56a266ae679198f4541d..5494e91467616f208e9f6747a5bf9973ebee65c7 100644 (file)
--- a/arch/arm/mach-bcm/board_bcm281xx.c
+++ b/arch/arm/mach-bcm/board_bcm281xx.c
@@ -12,37 +12,13 @@
  */
 
 #include <linux/of_platform.h>
-#include <linux/init.h>
-#include <linux/device.h>
-#include <linux/platform_device.h>
+#include <linux/of_address.h>
 #include <linux/clocksource.h>
 
 #include <asm/mach/arch.h>
-#include <asm/mach/time.h>
-#include <asm/hardware/cache-l2x0.h>
 
-#include "bcm_kona_smc.h"
 #include "kona.h"
 
-static int __init kona_l2_cache_init(void)
-{
-       if (!IS_ENABLED(CONFIG_CACHE_L2X0))
-               return 0;
-
-       if (bcm_kona_smc_init() < 0) {
-               pr_info("Kona secure API not available. Skipping L2 init\n");
-               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.
-        */
-       return l2x0_of_init(0, ~0);
-}
-
 static void bcm_board_setup_restart(void)
 {
        struct device_node *np;

diff --git a/arch/arm/mach-bcm/kona.c b/arch/arm/mach-bcm/kona.c
index 6939d9017f63369c3c34cba1921869ea7a873583..2f1db29291fe64f205d6a1678f02f378c42571ba 100644 (file)
--- a/arch/arm/mach-bcm/kona.c
+++ b/arch/arm/mach-bcm/kona.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Broadcom Corporation
+ * Copyright (C) 2012-2014 Broadcom Corporation
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -12,10 +12,38 @@
  */
 
 #include <linux/of_address.h>
+#include <linux/of_platform.h>
+#include <asm/hardware/cache-l2x0.h>
 #include <asm/io.h>
 
+#include "bcm_kona_smc.h"
 #include "kona.h"
 
+void __init kona_l2_cache_init(void)
+{
+       int ret;
+
+       if (!IS_ENABLED(CONFIG_CACHE_L2X0))
+               return;
+
+       ret = bcm_kona_smc_init();
+       if (ret) {
+               pr_info("Secure API not available (%d). Skipping L2 init.\n",
+                       ret);
+               return;
+       }
+
+       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.
+        */
+       ret = l2x0_of_init(0, ~0);
+       if (ret)
+               pr_err("Couldn't enable L2 cache: %d\n", ret);
+}
+
 static void __iomem *watchdog_base;
 
 void bcm_kona_setup_restart(void)

diff --git a/arch/arm/mach-bcm/kona.h b/arch/arm/mach-bcm/kona.h
index 291eca3e06ff1f0d6e27cd10e2f1d4a29c96cb21..f42aef8374446bd03e5bd82c4421f54fac156c07 100644 (file)
--- a/arch/arm/mach-bcm/kona.h
+++ b/arch/arm/mach-bcm/kona.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Broadcom Corporation
+ * Copyright (C) 2012-2014 Broadcom Corporation
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -13,5 +13,6 @@
 
 #include <linux/reboot.h>
 
+void __init kona_l2_cache_init(void);
 void bcm_kona_setup_restart(void);
 void bcm_kona_restart(enum reboot_mode mode, const char *cmd);