Merge tag 'armsoc/for-3.15/soc-2' into armsoc/for-3.15/soc-3

ARM: mach-bcm soc updates

- add BCM5301x support
- remove GENERIC_TIME

3 files changed, 88 insertions, 1 deletions

diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index b1aa6a9b3bd1..f2a2fb9909a1 100644
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -19,7 +19,6 @@ config ARCH_BCM_MOBILE
         select CPU_V7
         select CLKSRC_OF
         select GENERIC_CLOCKEVENTS
-        select GENERIC_TIME
         select GPIO_BCM_KONA
         select SPARSE_IRQ
         select TICK_ONESHOT
@@ -32,6 +31,32 @@ config ARCH_BCM_MOBILE
           BCM11130, BCM11140, BCM11351, BCM28145 and
           BCM28155 variants.
 
+config ARCH_BCM_5301X
+        bool "Broadcom BCM470X / BCM5301X ARM SoC" if ARCH_MULTI_V7
+        depends on MMU
+        select ARM_GIC
+        select CACHE_L2X0
+        select HAVE_ARM_SCU if SMP
+        select HAVE_ARM_TWD if SMP
+        select HAVE_SMP
+        select COMMON_CLK
+        select GENERIC_CLOCKEVENTS
+        select ARM_GLOBAL_TIMER
+        select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
+        select MIGHT_HAVE_PCI
+        help
+          Support for Broadcom BCM470X and BCM5301X SoCs with ARM CPU cores.
+
+          This is a network SoC line mostly used in home routers and
+          wifi access points, it's internal name is Northstar.
+          This inclused the following SoC: BCM53010, BCM53011, BCM53012,
+          BCM53014, BCM53015, BCM53016, BCM53017, BCM53018, BCM4707,
+          BCM4708 and BCM4709.
+
+          Do not confuse this with the BCM4760 which is a totally
+          different SoC or with the older BCM47XX and BCM53XX based
+          network SoC using a MIPS CPU, they are supported by arch/mips/bcm47xx
+
 endmenu
 
 endif
diff --git a/arch/arm/mach-bcm/Makefile b/arch/arm/mach-bcm/Makefile
index c2ccd5a0f772..01649132c9f2 100644
--- a/arch/arm/mach-bcm/Makefile
+++ b/arch/arm/mach-bcm/Makefile
@@ -13,3 +13,4 @@
 obj-$(CONFIG_ARCH_BCM_MOBILE)   := 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)
+obj-$(CONFIG_ARCH_BCM_5301X)    += bcm_5301x.o
diff --git a/arch/arm/mach-bcm/bcm_5301x.c b/arch/arm/mach-bcm/bcm_5301x.c
new file mode 100644
index 000000000000..edff69761e04
--- /dev/null
+++ b/arch/arm/mach-bcm/bcm_5301x.c
@@ -0,0 +1,61 @@
+/*
+ * Broadcom BCM470X / BCM5301X ARM platform code.
+ *
+ * Copyright 2013 Hauke Mehrtens <hauke@hauke-m.de>
+ *
+ * Licensed under the GNU/GPL. See COPYING for details.
+ */
+#include <linux/of_platform.h>
+#include <asm/hardware/cache-l2x0.h>
+
+#include <asm/mach/arch.h>
+#include <asm/siginfo.h>
+#include <asm/signal.h>
+
+
+static bool first_fault = true;
+
+static int bcm5301x_abort_handler(unsigned long addr, unsigned int fsr,
+                                 struct pt_regs *regs)
+{
+        if (fsr == 0x1c06 && first_fault) {
+                first_fault = false;
+
+                /*
+                 * These faults with code 0x1c06 happens for no good reason,
+                 * possibly left over from the CFE boot loader.
+                 */
+                pr_warn("External imprecise Data abort at addr=%#lx, fsr=%#x ignored.\n",
+                addr, fsr);
+
+                /* Returning non-zero causes fault display and panic */
+                return 0;
+        }
+
+        /* Others should cause a fault */
+        return 1;
+}
+
+static void __init bcm5301x_init_early(void)
+{
+        /* Install our hook */
+        hook_fault_code(16 + 6, bcm5301x_abort_handler, SIGBUS, BUS_OBJERR,
+                        "imprecise external abort");
+}
+
+static void __init bcm5301x_dt_init(void)
+{
+        l2x0_of_init(0, ~0UL);
+        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+}
+
+static const char __initconst *bcm5301x_dt_compat[] = {
+        "brcm,bcm4708",
+        NULL,
+};
+
+DT_MACHINE_START(BCM5301X, "BCM5301X")
+        .init_early     = bcm5301x_init_early,
+        .init_machine   = bcm5301x_dt_init,
+        .dt_compat      = bcm5301x_dt_compat,
+MACHINE_END