brcm47xx: remove support for kernel 3.18

[openwrt/svn-archive/archive.git] / target / linux / brcm47xx / patches-3.18 / 030-05-MIPS-BCM47XX-Initialize-bcma-bus-later-with-mm-avail.patch

diff --git a/target/linux/brcm47xx/patches-3.18/030-05-MIPS-BCM47XX-Initialize-bcma-bus-later-with-mm-avail.patch b/target/linux/brcm47xx/patches-3.18/030-05-MIPS-BCM47XX-Initialize-bcma-bus-later-with-mm-avail.patch
deleted file mode 100644 (file)
index 1e77063..0000000
--- a/target/linux/brcm47xx/patches-3.18/030-05-MIPS-BCM47XX-Initialize-bcma-bus-later-with-mm-avail.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From e5810fa0c1bed16fdfb408862a2e17e962ec5cf6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Date: Tue, 28 Oct 2014 14:40:38 +0100
-Subject: [PATCH 158/158] MIPS: BCM47XX: Initialize bcma bus later (with mm
- available)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Initializaion with memory allocator available will be much simpler, this
-will allow cleanup in the bcma code.
-
-Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
-Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
-Cc: linux-mips@linux-mips.org
-Patchwork: https://patchwork.linux-mips.org/patch/8234/
-Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
----
- arch/mips/bcm47xx/bcm47xx_private.h |  3 +++
- arch/mips/bcm47xx/irq.c             |  8 ++++++++
- arch/mips/bcm47xx/setup.c           | 33 +++++++++++++++++++++++++++------
- 3 files changed, 38 insertions(+), 6 deletions(-)
-
---- a/arch/mips/bcm47xx/bcm47xx_private.h
-+++ b/arch/mips/bcm47xx/bcm47xx_private.h
-@@ -15,6 +15,9 @@ int __init bcm47xx_buttons_register(void
- /* leds.c */
- void __init bcm47xx_leds_register(void);
- 
-+/* setup.c */
-+void __init bcm47xx_bus_setup(void);
-+
- /* workarounds.c */
- void __init bcm47xx_workarounds(void);
- 
---- a/arch/mips/bcm47xx/irq.c
-+++ b/arch/mips/bcm47xx/irq.c
-@@ -22,6 +22,8 @@
-  *  675 Mass Ave, Cambridge, MA 02139, USA.
-  */
- 
-+#include "bcm47xx_private.h"
-+
- #include <linux/types.h>
- #include <linux/interrupt.h>
- #include <linux/irq.h>
-@@ -65,6 +67,12 @@ DEFINE_HWx_IRQDISPATCH(7)
- 
- void __init arch_init_irq(void)
- {
-+      /*
-+       * This is the first arch callback after mm_init (we can use kmalloc),
-+       * so let's finish bus initialization now.
-+       */
-+      bcm47xx_bus_setup();
-+
- #ifdef CONFIG_BCM47XX_BCMA
-       if (bcm47xx_bus_type == BCM47XX_BUS_TYPE_BCMA) {
-               bcma_write32(bcm47xx_bus.bcma.bus.drv_mips.core,
---- a/arch/mips/bcm47xx/setup.c
-+++ b/arch/mips/bcm47xx/setup.c
-@@ -156,15 +156,14 @@ static void __init bcm47xx_register_bcma
-       err = bcma_host_soc_register(&bcm47xx_bus.bcma);
-       if (err)
-               panic("Failed to register BCMA bus (err %d)", err);
--
--      err = bcma_host_soc_init(&bcm47xx_bus.bcma);
--      if (err)
--              panic("Failed to initialize BCMA bus (err %d)", err);
--
--      bcm47xx_fill_bcma_boardinfo(&bcm47xx_bus.bcma.bus.boardinfo, NULL);
- }
- #endif
- 
-+/*
-+ * Memory setup is done in the early part of MIPS's arch_mem_init. It's supposed
-+ * to detect memory and record it with add_memory_region.
-+ * Any extra initializaion performed here must not use kmalloc or bootmem.
-+ */
- void __init plat_mem_setup(void)
- {
-       struct cpuinfo_mips *c = &current_cpu_data;
-@@ -193,6 +192,28 @@ void __init plat_mem_setup(void)
-       _machine_restart = bcm47xx_machine_restart;
-       _machine_halt = bcm47xx_machine_halt;
-       pm_power_off = bcm47xx_machine_halt;
-+}
-+
-+/*
-+ * This finishes bus initialization doing things that were not possible without
-+ * kmalloc. Make sure to call it late enough (after mm_init).
-+ */
-+void __init bcm47xx_bus_setup(void)
-+{
-+#ifdef CONFIG_BCM47XX_BCMA
-+      if (bcm47xx_bus_type == BCM47XX_BUS_TYPE_BCMA) {
-+              int err;
-+
-+              err = bcma_host_soc_init(&bcm47xx_bus.bcma);
-+              if (err)
-+                      panic("Failed to initialize BCMA bus (err %d)", err);
-+
-+              bcm47xx_fill_bcma_boardinfo(&bcm47xx_bus.bcma.bus.boardinfo,
-+                                          NULL);
-+      }
-+#endif
-+
-+      /* With bus initialized we can access NVRAM and detect the board */
-       bcm47xx_board_detect();
-       mips_set_machine_name(bcm47xx_board_get_name());
- }