ARM: bcm: Rename board_bcm

In order to support multiple SoC models in the mach-bcm
directory, board_bcm.c is being renamed board_bcm281xx.c

Reviewed-by: Markus Mayer <markus.mayer@linaro.org>
Signed-off-by: Christian Daudt <csd@broadcom.com>

diff --git a/arch/arm/mach-bcm/Makefile b/arch/arm/mach-bcm/Makefile
index 7e5ca0a90358ef007d645e8285fbb271c539b6b5..e3d03033a7e2749c30eb5f18e28ec45adf42d096 100644 (file)
--- a/arch/arm/mach-bcm/Makefile
+++ b/arch/arm/mach-bcm/Makefile
@@ -10,6 +10,6 @@
 # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-obj-$(CONFIG_ARCH_BCM) := board_bcm.o bcm_kona_smc.o bcm_kona_smc_asm.o kona.o
+obj-$(CONFIG_ARCH_BCM)         := board_bcm281xx.o bcm_kona_smc.o bcm_kona_smc_asm.o kona.o
 plus_sec := $(call as-instr,.arch_extension sec,+sec)
 AFLAGS_bcm_kona_smc_asm.o      :=-Wa,-march=armv7-a$(plus_sec)

diff --git a/arch/arm/mach-bcm/board_bcm.c b/arch/arm/mach-bcm/board_bcm.c
deleted file mode 100644 (file)
index 1e49ec0..0000000
--- a/arch/arm/mach-bcm/board_bcm.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2012-2013 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
- * published by the Free Software Foundation version 2.
- *
- * This program is distributed "as is" WITHOUT ANY WARRANTY of any
- * kind, whether express or implied; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include <linux/of_platform.h>
-#include <linux/init.h>
-#include <linux/device.h>
-#include <linux/platform_device.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;
-
-       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 bcm_board_setup_restart(void)
-{
-       struct device_node *np;
-
-       np = of_find_compatible_node(NULL, NULL, "bcm,bcm11351");
-       if (np) {
-               if (of_device_is_available(np))
-                       bcm_kona_setup_restart();
-               of_node_put(np);
-       }
-       /* Restart setup for other boards goes here */
-}
-
-static void __init board_init(void)
-{
-       of_platform_populate(NULL, of_default_bus_match_table, NULL,
-               &platform_bus);
-
-       bcm_kona_smc_init();
-       bcm_board_setup_restart();
-       kona_l2_cache_init();
-}
-
-static const char * const bcm11351_dt_compat[] = { "bcm,bcm11351", NULL, };
-
-DT_MACHINE_START(BCM11351_DT, "Broadcom Application Processor")
-       .init_time = clocksource_of_init,
-       .init_machine = board_init,
-       .restart = bcm_kona_restart,
-       .dt_compat = bcm11351_dt_compat,
-MACHINE_END

diff --git a/arch/arm/mach-bcm/board_bcm281xx.c b/arch/arm/mach-bcm/board_bcm281xx.c
new file mode 100644 (file)
index 0000000..1e49ec0
--- /dev/null
+++ b/arch/arm/mach-bcm/board_bcm281xx.c
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2012-2013 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
+ * published by the Free Software Foundation version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/of_platform.h>
+#include <linux/init.h>
+#include <linux/device.h>
+#include <linux/platform_device.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;
+
+       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 bcm_board_setup_restart(void)
+{
+       struct device_node *np;
+
+       np = of_find_compatible_node(NULL, NULL, "bcm,bcm11351");
+       if (np) {
+               if (of_device_is_available(np))
+                       bcm_kona_setup_restart();
+               of_node_put(np);
+       }
+       /* Restart setup for other boards goes here */
+}
+
+static void __init board_init(void)
+{
+       of_platform_populate(NULL, of_default_bus_match_table, NULL,
+               &platform_bus);
+
+       bcm_kona_smc_init();
+       bcm_board_setup_restart();
+       kona_l2_cache_init();
+}
+
+static const char * const bcm11351_dt_compat[] = { "bcm,bcm11351", NULL, };
+
+DT_MACHINE_START(BCM11351_DT, "Broadcom Application Processor")
+       .init_time = clocksource_of_init,
+       .init_machine = board_init,
+       .restart = bcm_kona_restart,
+       .dt_compat = bcm11351_dt_compat,
+MACHINE_END