brcm47xx: add support for kernel 4.1

This adds support for kernel 4.1 and removes kernel 4.0.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 46166

diff --git a/target/linux/brcm47xx/config-4.1 b/target/linux/brcm47xx/config-4.1
new file mode 100644 (file)
index 0000000..f601824
--- /dev/null
+++ b/target/linux/brcm47xx/config-4.1
@@ -0,0 +1,185 @@
+CONFIG_ADM6996_PHY=y
+CONFIG_ARCH_BINFMT_ELF_STATE=y
+CONFIG_ARCH_DISCARD_MEMBLOCK=y
+CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
+CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
+# CONFIG_ARCH_HAS_GCOV_PROFILE_ALL is not set
+# CONFIG_ARCH_HAS_SG_CHAIN is not set
+CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_B53=y
+# CONFIG_B53_MMAP_DRIVER is not set
+CONFIG_B53_PHY_DRIVER=y
+CONFIG_B53_PHY_FIXUP=y
+# CONFIG_B53_SRAB_DRIVER is not set
+CONFIG_BCM47XX=y
+CONFIG_BCM47XX_BCMA=y
+CONFIG_BCM47XX_SSB=y
+CONFIG_BCM47XX_WDT=y
+CONFIG_BCMA=y
+CONFIG_BCMA_BLOCKIO=y
+CONFIG_BCMA_DEBUG=y
+CONFIG_BCMA_DRIVER_GMAC_CMN=y
+CONFIG_BCMA_DRIVER_GPIO=y
+CONFIG_BCMA_DRIVER_MIPS=y
+CONFIG_BCMA_DRIVER_PCI=y
+CONFIG_BCMA_DRIVER_PCI_HOSTMODE=y
+CONFIG_BCMA_HOST_PCI=y
+CONFIG_BCMA_HOST_PCI_POSSIBLE=y
+CONFIG_BCMA_HOST_SOC=y
+CONFIG_BCMA_NFLASH=y
+CONFIG_BCMA_SFLASH=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_CEVT_R4K=y
+CONFIG_CLONE_BACKWARDS=y
+CONFIG_CMDLINE="noinitrd console=ttyS0,115200"
+CONFIG_CMDLINE_BOOL=y
+# CONFIG_CMDLINE_OVERRIDE is not set
+# CONFIG_CPU_BMIPS is not set
+CONFIG_CPU_GENERIC_DUMP_TLB=y
+CONFIG_CPU_HAS_PREFETCH=y
+CONFIG_CPU_HAS_SYNC=y
+CONFIG_CPU_LITTLE_ENDIAN=y
+CONFIG_CPU_MIPS32=y
+CONFIG_CPU_MIPS32_R1=y
+# CONFIG_CPU_MIPS32_R2 is not set
+CONFIG_CPU_MIPSR1=y
+CONFIG_CPU_MIPSR2_IRQ_VI=y
+CONFIG_CPU_NEEDS_NO_SMARTMIPS_OR_MICROMIPS=y
+CONFIG_CPU_R4K_CACHE_TLB=y
+CONFIG_CPU_R4K_FPU=y
+CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
+CONFIG_CPU_SUPPORTS_HIGHMEM=y
+CONFIG_CSRC_R4K=y
+CONFIG_DMA_NONCOHERENT=y
+# CONFIG_EARLY_PRINTK is not set
+CONFIG_FIXED_PHY=y
+CONFIG_GENERIC_ATOMIC64=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_GENERIC_IO=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_SCHED_CLOCK=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIO_DEVRES=y
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_WDT=y
+CONFIG_HARDWARE_WATCHPOINTS=y
+CONFIG_HAS_DMA=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT_MAP=y
+# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
+# CONFIG_HAVE_ARCH_BITREVERSE is not set
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
+CONFIG_HAVE_BPF_JIT=y
+CONFIG_HAVE_CC_STACKPROTECTOR=y
+CONFIG_HAVE_CONTEXT_TRACKING=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_HAVE_IDE=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_MEMBLOCK=y
+CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
+CONFIG_HAVE_NET_DSA=y
+CONFIG_HAVE_OPROFILE=y
+CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
+CONFIG_HW_HAS_PCI=y
+CONFIG_HW_RANDOM=y
+CONFIG_HZ_PERIODIC=y
+CONFIG_IMAGE_CMDLINE_HACK=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_IRQ_CPU=y
+CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_IRQ_WORK=y
+CONFIG_LEDS_GPIO_REGISTER=y
+# CONFIG_LZ4_COMPRESS is not set
+# CONFIG_LZ4_DECOMPRESS is not set
+CONFIG_MDIO_BOARDINFO=y
+CONFIG_MIPS=y
+# CONFIG_MIPS_HUGE_TLB_SUPPORT is not set
+CONFIG_MIPS_L1_CACHE_SHIFT=5
+# CONFIG_MIPS_MACHINE is not set
+CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_MTD_BCM47XXSFLASH=y
+CONFIG_MTD_BCM47XX_PARTS=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_BCM47XXNFLASH=y
+CONFIG_MTD_NAND_ECC=y
+CONFIG_MTD_PHYSMAP=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_NEED_PER_CPU_KM=y
+CONFIG_NO_EXCEPT_FILL=y
+CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
+# CONFIG_NO_IOPORT_MAP is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_PCI=y
+CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PERF_USE_VMALLOC=y
+CONFIG_PGTABLE_LEVELS=2
+CONFIG_PHYLIB=y
+# CONFIG_RCU_EXPEDITE_BOOT is not set
+# CONFIG_RCU_STALL_COMMON is not set
+CONFIG_SCHED_HRTICK=y
+# CONFIG_SCSI_DMA is not set
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SRCU=y
+CONFIG_SSB=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_DEBUG=y
+CONFIG_SSB_DRIVER_EXTIF=y
+CONFIG_SSB_DRIVER_GIGE=y
+CONFIG_SSB_DRIVER_GPIO=y
+CONFIG_SSB_DRIVER_MIPS=y
+CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_EMBEDDED=y
+CONFIG_SSB_PCICORE_HOSTMODE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_SERIAL=y
+CONFIG_SSB_SFLASH=y
+CONFIG_SSB_SPROM=y
+CONFIG_SWCONFIG=y
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
+CONFIG_SYS_HAS_CPU_BMIPS=y
+CONFIG_SYS_HAS_CPU_BMIPS32_3300=y
+CONFIG_SYS_HAS_CPU_MIPS32_R1=y
+CONFIG_SYS_HAS_CPU_MIPS32_R2=y
+CONFIG_SYS_HAS_EARLY_PRINTK=y
+CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
+CONFIG_SYS_SUPPORTS_HIGHMEM=y
+CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
+CONFIG_SYS_SUPPORTS_MIPS16=y
+CONFIG_TICK_CPU_ACCOUNTING=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USE_GENERIC_EARLY_PRINTK_8250=y
+CONFIG_WATCHDOG_CORE=y
+CONFIG_ZONE_DMA_FLAG=0

diff --git a/target/linux/brcm47xx/patches-4.0/030-01-MIPS-BCM47XX-Support-SPROM-prefixes-for-PCI-devices.patch b/target/linux/brcm47xx/patches-4.0/030-01-MIPS-BCM47XX-Support-SPROM-prefixes-for-PCI-devices.patch
deleted file mode 100644 (file)
index e78b159..0000000
--- a/target/linux/brcm47xx/patches-4.0/030-01-MIPS-BCM47XX-Support-SPROM-prefixes-for-PCI-devices.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 9a6a2b96dfd8b01336f8519a5be7fb353cfa62fb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Date: Sat, 14 Mar 2015 17:55:54 +0100
-Subject: [PATCH] MIPS: BCM47XX: Support SPROM prefixes for PCI devices
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Support parsing SPROMs with prefixes defined like devpath1=pci/1/1
-
-Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
-Cc: linux-mips@linux-mips.org
-Cc: Hauke Mehrtens <hauke@hauke-m.de>
-Patchwork: https://patchwork.linux-mips.org/patch/9552/
-Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
----
- arch/mips/bcm47xx/sprom.c | 33 +++++++++++++++++++++++++++++++++
- 1 file changed, 33 insertions(+)
-
---- a/arch/mips/bcm47xx/sprom.c
-+++ b/arch/mips/bcm47xx/sprom.c
-@@ -836,6 +836,38 @@ static int bcm47xx_get_sprom_ssb(struct
- #endif
- 
- #if defined(CONFIG_BCM47XX_BCMA)
-+/*
-+ * Having many NVRAM entries for PCI devices led to repeating prefixes like
-+ * pci/1/1/ all the time and wasting flash space. So at some point Broadcom
-+ * decided to introduce prefixes like 0: 1: 2: etc.
-+ * If we find e.g. devpath0=pci/2/1 or devpath0=pci/2/1/ we should use 0:
-+ * instead of pci/2/1/.
-+ */
-+static void bcm47xx_sprom_apply_prefix_alias(char *prefix, size_t prefix_size)
-+{
-+      size_t prefix_len = strlen(prefix);
-+      size_t short_len = prefix_len - 1;
-+      char nvram_var[10];
-+      char buf[20];
-+      int i;
-+
-+      /* Passed prefix has to end with a slash */
-+      if (prefix_len <= 0 || prefix[prefix_len - 1] != '/')
-+              return;
-+
-+      for (i = 0; i < 3; i++) {
-+              if (snprintf(nvram_var, sizeof(nvram_var), "devpath%d", i) <= 0)
-+                      continue;
-+              if (bcm47xx_nvram_getenv(nvram_var, buf, sizeof(buf)) < 0)
-+                      continue;
-+              if (!strcmp(buf, prefix) ||
-+                  (short_len && strlen(buf) == short_len && !strncmp(buf, prefix, short_len))) {
-+                      snprintf(prefix, prefix_size, "%d:", i);
-+                      return;
-+              }
-+      }
-+}
-+
- static int bcm47xx_get_sprom_bcma(struct bcma_bus *bus, struct ssb_sprom *out)
- {
-       char prefix[10];
-@@ -847,6 +879,7 @@ static int bcm47xx_get_sprom_bcma(struct
-               snprintf(prefix, sizeof(prefix), "pci/%u/%u/",
-                        bus->host_pci->bus->number + 1,
-                        PCI_SLOT(bus->host_pci->devfn));
-+              bcm47xx_sprom_apply_prefix_alias(prefix, sizeof(prefix));
-               bcm47xx_fill_sprom(out, prefix, false);
-               return 0;
-       case BCMA_HOSTTYPE_SOC:

diff --git a/target/linux/brcm47xx/patches-4.0/030-03-MIPS-BCM47XX-Use-helpers-for-reading-NVRAM-content.patch b/target/linux/brcm47xx/patches-4.0/030-03-MIPS-BCM47XX-Use-helpers-for-reading-NVRAM-content.patch
deleted file mode 100644 (file)
index 9c9865f..0000000
--- a/target/linux/brcm47xx/patches-4.0/030-03-MIPS-BCM47XX-Use-helpers-for-reading-NVRAM-content.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 23d2bc42aceb829eaf90c694941e4523c22865e8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Date: Wed, 10 Dec 2014 11:49:53 +0100
-Subject: [PATCH] MIPS: BCM47XX: Use helpers for reading NVRAM content
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Also drop some unneeded memset-s.
-
-Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
-Cc: Hauke Mehrtens <hauke@hauke-m.de>
-Cc: Paul Walmsley <paul@pwsan.com>
-Cc: linux-mips@linux-mips.org
-Patchwork: https://patchwork.linux-mips.org/patch/8661/
-Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
----
- arch/mips/bcm47xx/nvram.c | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
---- a/arch/mips/bcm47xx/nvram.c
-+++ b/arch/mips/bcm47xx/nvram.c
-@@ -91,7 +91,6 @@ static int nvram_find_and_copy(void __io
-       return -ENXIO;
- 
- found:
--
-       if (header->len > size)
-               pr_err("The nvram size accoridng to the header seems to be bigger than the partition on flash\n");
-       if (header->len > NVRAM_SPACE)
-@@ -101,10 +100,9 @@ found:
-       src = (u32 *) header;
-       dst = (u32 *) nvram_buf;
-       for (i = 0; i < sizeof(struct nvram_header); i += 4)
--              *dst++ = *src++;
-+              *dst++ = __raw_readl(src++);
-       for (; i < header->len && i < NVRAM_SPACE && i < size; i += 4)
--              *dst++ = le32_to_cpu(*src++);
--      memset(dst, 0x0, NVRAM_SPACE - i);
-+              *dst++ = readl(src++);
- 
-       return 0;
- }
-@@ -165,7 +163,6 @@ static int nvram_init(void)
-                       err = mtd_read(mtd, from, len, &bytes_read, dst);
-                       if (err)
-                               return err;
--                      memset(dst + bytes_read, 0x0, NVRAM_SPACE - bytes_read);
- 
-                       return 0;
-               }

diff --git a/target/linux/brcm47xx/patches-4.0/030-04-MIPS-BCM47XX-Use-strnchr-to-avoid-reading-out-of-the.patch b/target/linux/brcm47xx/patches-4.0/030-04-MIPS-BCM47XX-Use-strnchr-to-avoid-reading-out-of-the.patch
deleted file mode 100644 (file)
index ee2e273..0000000
--- a/target/linux/brcm47xx/patches-4.0/030-04-MIPS-BCM47XX-Use-strnchr-to-avoid-reading-out-of-the.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 80aaaa8b93d860f828e2cf883f307894640765f0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Date: Wed, 10 Dec 2014 11:49:54 +0100
-Subject: [PATCH] MIPS: BCM47XX: Use strnchr to avoid reading out of the buffer
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
-Cc: Hauke Mehrtens <hauke@hauke-m.de>
-Cc: Paul Walmsley <paul@pwsan.com>
-Cc: linux-mips@linux-mips.org
-Patchwork: https://patchwork.linux-mips.org/patch/8662/
-Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
----
- arch/mips/bcm47xx/nvram.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/arch/mips/bcm47xx/nvram.c
-+++ b/arch/mips/bcm47xx/nvram.c
-@@ -175,7 +175,7 @@ static int nvram_init(void)
- int bcm47xx_nvram_getenv(const char *name, char *val, size_t val_len)
- {
-       char *var, *value, *end, *eq;
--      int err;
-+      int data_left, err;
- 
-       if (!name)
-               return -EINVAL;
-@@ -191,7 +191,9 @@ int bcm47xx_nvram_getenv(const char *nam
-       end = nvram_buf + sizeof(nvram_buf) - 2;
-       end[0] = end[1] = '\0';
-       for (; *var; var = value + strlen(value) + 1) {
--              eq = strchr(var, '=');
-+              data_left = end - var;
-+
-+              eq = strnchr(var, data_left, '=');
-               if (!eq)
-                       break;
-               value = eq + 1;

diff --git a/target/linux/brcm47xx/patches-4.0/030-05-MIPS-BCM47xx-Move-NVRAM-header-to-the-include-linux.patch b/target/linux/brcm47xx/patches-4.0/030-05-MIPS-BCM47xx-Move-NVRAM-header-to-the-include-linux.patch
deleted file mode 100644 (file)
index c1c0927..0000000
--- a/target/linux/brcm47xx/patches-4.0/030-05-MIPS-BCM47xx-Move-NVRAM-header-to-the-include-linux.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-From 138173d4e826587da66c7d321da1a91283222536 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Date: Mon, 1 Dec 2014 07:58:18 +0100
-Subject: [PATCH] MIPS: BCM47xx: Move NVRAM header to the include/linux/.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-There are two reasons for having this header in the common place:
-1) Simplifying drivers that read NVRAM entries. We will be able to
-   safely call bcm47xx_nvram_* functions without #ifdef-s.
-2) Getting NVRAM driver out of MIPS arch code. This is needed to support
-   BCM5301X arch which also requires this NVRAM driver. Patch for that
-   will follow once we get is reviewed.
-
-Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
-Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
-Cc: linux-mips@linux-mips.org
-Cc: Arnd Bergmann <arnd@arndb.de>
-Cc: Paul Walmsley <paul@pwsan.com>
-Cc: linux-soc@vger.kernel.org
-Patchwork: https://patchwork.linux-mips.org/patch/8619/
-Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
----
- arch/mips/bcm47xx/board.c                          |  2 +-
- arch/mips/bcm47xx/nvram.c                          |  2 +-
- arch/mips/bcm47xx/setup.c                          |  1 -
- arch/mips/bcm47xx/sprom.c                          |  1 -
- arch/mips/bcm47xx/time.c                           |  1 -
- arch/mips/include/asm/mach-bcm47xx/bcm47xx.h       |  1 +
- arch/mips/include/asm/mach-bcm47xx/bcm47xx_nvram.h | 21 -------------
- drivers/bcma/driver_mips.c                         |  2 +-
- drivers/net/ethernet/broadcom/b44.c                |  2 +-
- drivers/net/ethernet/broadcom/bgmac.c              |  2 +-
- drivers/ssb/driver_chipcommon_pmu.c                |  2 +-
- drivers/ssb/driver_mipscore.c                      |  2 +-
- include/linux/bcm47xx_nvram.h                      | 34 ++++++++++++++++++++++
- 13 files changed, 42 insertions(+), 31 deletions(-)
- delete mode 100644 arch/mips/include/asm/mach-bcm47xx/bcm47xx_nvram.h
- create mode 100644 include/linux/bcm47xx_nvram.h
-
---- a/arch/mips/bcm47xx/board.c
-+++ b/arch/mips/bcm47xx/board.c
-@@ -1,8 +1,8 @@
- #include <linux/errno.h>
- #include <linux/export.h>
- #include <linux/string.h>
-+#include <bcm47xx.h>
- #include <bcm47xx_board.h>
--#include <bcm47xx_nvram.h>
- 
- struct bcm47xx_board_type {
-       const enum bcm47xx_board board;
---- a/arch/mips/bcm47xx/nvram.c
-+++ b/arch/mips/bcm47xx/nvram.c
-@@ -16,7 +16,7 @@
- #include <linux/kernel.h>
- #include <linux/string.h>
- #include <linux/mtd/mtd.h>
--#include <bcm47xx_nvram.h>
-+#include <linux/bcm47xx_nvram.h>
- 
- #define NVRAM_MAGIC           0x48534C46      /* 'FLSH' */
- #define NVRAM_SPACE           0x8000
---- a/arch/mips/bcm47xx/setup.c
-+++ b/arch/mips/bcm47xx/setup.c
-@@ -42,7 +42,6 @@
- #include <asm/reboot.h>
- #include <asm/time.h>
- #include <bcm47xx.h>
--#include <bcm47xx_nvram.h>
- #include <bcm47xx_board.h>
- 
- union bcm47xx_bus bcm47xx_bus;
---- a/arch/mips/bcm47xx/sprom.c
-+++ b/arch/mips/bcm47xx/sprom.c
-@@ -27,7 +27,6 @@
-  */
- 
- #include <bcm47xx.h>
--#include <bcm47xx_nvram.h>
- #include <linux/if_ether.h>
- #include <linux/etherdevice.h>
- 
---- a/arch/mips/bcm47xx/time.c
-+++ b/arch/mips/bcm47xx/time.c
-@@ -27,7 +27,6 @@
- #include <linux/ssb/ssb.h>
- #include <asm/time.h>
- #include <bcm47xx.h>
--#include <bcm47xx_nvram.h>
- #include <bcm47xx_board.h>
- 
- void __init plat_time_init(void)
---- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h
-+++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h
-@@ -22,6 +22,7 @@
- #include <linux/ssb/ssb.h>
- #include <linux/bcma/bcma.h>
- #include <linux/bcma/bcma_soc.h>
-+#include <linux/bcm47xx_nvram.h>
- 
- enum bcm47xx_bus_type {
- #ifdef CONFIG_BCM47XX_SSB
---- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_nvram.h
-+++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_nvram.h
-@@ -1,21 +1 @@
--/*
-- *  Copyright (C) 2005, Broadcom Corporation
-- *  Copyright (C) 2006, Felix Fietkau <nbd@openwrt.org>
-- *
-- *  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;  either version 2 of the  License, or (at your
-- *  option) any later version.
-- */
--
--#ifndef __BCM47XX_NVRAM_H
--#define __BCM47XX_NVRAM_H
--
--#include <linux/types.h>
--#include <linux/kernel.h>
--
--int bcm47xx_nvram_init_from_mem(u32 base, u32 lim);
--int bcm47xx_nvram_getenv(const char *name, char *val, size_t val_len);
--int bcm47xx_nvram_gpio_pin(const char *name);
--
--#endif /* __BCM47XX_NVRAM_H */
-+#include <linux/bcm47xx_nvram.h>
---- a/drivers/bcma/driver_mips.c
-+++ b/drivers/bcma/driver_mips.c
-@@ -21,7 +21,7 @@
- #include <linux/serial_reg.h>
- #include <linux/time.h>
- #ifdef CONFIG_BCM47XX
--#include <bcm47xx_nvram.h>
-+#include <linux/bcm47xx_nvram.h>
- #endif
- 
- enum bcma_boot_dev {
---- a/drivers/net/ethernet/broadcom/b44.c
-+++ b/drivers/net/ethernet/broadcom/b44.c
-@@ -400,7 +400,7 @@ static void b44_set_flow_ctrl(struct b44
- }
- 
- #ifdef CONFIG_BCM47XX
--#include <bcm47xx_nvram.h>
-+#include <linux/bcm47xx_nvram.h>
- static void b44_wap54g10_workaround(struct b44 *bp)
- {
-       char buf[20];
---- a/drivers/net/ethernet/broadcom/bgmac.c
-+++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -18,7 +18,7 @@
- #include <linux/interrupt.h>
- #include <linux/dma-mapping.h>
- #include <linux/platform_data/b53.h>
--#include <bcm47xx_nvram.h>
-+#include <linux/bcm47xx_nvram.h>
- 
- static const struct bcma_device_id bgmac_bcma_tbl[] = {
-       BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_4706_MAC_GBIT, BCMA_ANY_REV, BCMA_ANY_CLASS),
---- a/drivers/ssb/driver_chipcommon_pmu.c
-+++ b/drivers/ssb/driver_chipcommon_pmu.c
-@@ -14,7 +14,7 @@
- #include <linux/delay.h>
- #include <linux/export.h>
- #ifdef CONFIG_BCM47XX
--#include <bcm47xx_nvram.h>
-+#include <linux/bcm47xx_nvram.h>
- #endif
- 
- #include "ssb_private.h"
---- a/drivers/ssb/driver_mipscore.c
-+++ b/drivers/ssb/driver_mipscore.c
-@@ -16,7 +16,7 @@
- #include <linux/serial_reg.h>
- #include <linux/time.h>
- #ifdef CONFIG_BCM47XX
--#include <bcm47xx_nvram.h>
-+#include <linux/bcm47xx_nvram.h>
- #endif
- 
- #include "ssb_private.h"
---- /dev/null
-+++ b/include/linux/bcm47xx_nvram.h
-@@ -0,0 +1,34 @@
-+/*
-+ *  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;  either version 2 of the  License, or (at your
-+ *  option) any later version.
-+ */
-+
-+#ifndef __BCM47XX_NVRAM_H
-+#define __BCM47XX_NVRAM_H
-+
-+#include <linux/types.h>
-+#include <linux/kernel.h>
-+
-+#ifdef CONFIG_BCM47XX
-+int bcm47xx_nvram_init_from_mem(u32 base, u32 lim);
-+int bcm47xx_nvram_getenv(const char *name, char *val, size_t val_len);
-+int bcm47xx_nvram_gpio_pin(const char *name);
-+#else
-+static inline int bcm47xx_nvram_init_from_mem(u32 base, u32 lim)
-+{
-+      return -ENOTSUPP;
-+};
-+static inline int bcm47xx_nvram_getenv(const char *name, char *val,
-+                                     size_t val_len)
-+{
-+      return -ENOTSUPP;
-+};
-+static inline int bcm47xx_nvram_gpio_pin(const char *name)
-+{
-+      return -ENOTSUPP;
-+};
-+#endif
-+
-+#endif /* __BCM47XX_NVRAM_H */

diff --git a/target/linux/brcm47xx/patches-4.0/030-06-MIPS-BCM47XX-Fix-coding-style-to-match-kernel-standa.patch b/target/linux/brcm47xx/patches-4.0/030-06-MIPS-BCM47XX-Fix-coding-style-to-match-kernel-standa.patch
deleted file mode 100644 (file)
index 826307b..0000000
--- a/target/linux/brcm47xx/patches-4.0/030-06-MIPS-BCM47XX-Fix-coding-style-to-match-kernel-standa.patch
+++ /dev/null
@@ -1,258 +0,0 @@
-From d548ca6b0784a99f0fcae397f115823ccd0361a5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Date: Wed, 10 Dec 2014 17:38:26 +0100
-Subject: [PATCH] MIPS: BCM47XX: Fix coding style to match kernel standards
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-[ralf@linux-mips.org: Fixed conflicts.]
-
-Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
-Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
-Cc: linux-mips@linux-mips.org
-Cc: Paul Walmsley <paul@pwsan.com>
-Patchwork: https://patchwork.linux-mips.org/patch/8665/
-Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
----
- arch/mips/bcm47xx/bcm47xx_private.h |  4 ++++
- arch/mips/bcm47xx/board.c           |  3 +--
- arch/mips/bcm47xx/nvram.c           | 25 ++++++++++++++-----------
- arch/mips/bcm47xx/prom.c            |  3 +--
- arch/mips/bcm47xx/serial.c          |  8 ++++----
- arch/mips/bcm47xx/setup.c           | 12 ++++++------
- arch/mips/bcm47xx/sprom.c           |  8 ++++----
- arch/mips/bcm47xx/time.c            |  1 -
- 8 files changed, 34 insertions(+), 30 deletions(-)
-
---- a/arch/mips/bcm47xx/bcm47xx_private.h
-+++ b/arch/mips/bcm47xx/bcm47xx_private.h
-@@ -1,6 +1,10 @@
- #ifndef LINUX_BCM47XX_PRIVATE_H_
- #define LINUX_BCM47XX_PRIVATE_H_
- 
-+#ifndef pr_fmt
-+#define pr_fmt(fmt)           "bcm47xx: " fmt
-+#endif
-+
- #include <linux/kernel.h>
- 
- /* prom.c */
---- a/arch/mips/bcm47xx/board.c
-+++ b/arch/mips/bcm47xx/board.c
-@@ -330,9 +330,8 @@ void __init bcm47xx_board_detect(void)
-       err = bcm47xx_nvram_getenv("boardtype", buf, sizeof(buf));
- 
-       /* init of nvram failed, probably too early now */
--      if (err == -ENXIO) {
-+      if (err == -ENXIO)
-               return;
--      }
- 
-       board_detected = bcm47xx_board_get_nvram();
-       bcm47xx_board.board = board_detected->board;
---- a/arch/mips/bcm47xx/nvram.c
-+++ b/arch/mips/bcm47xx/nvram.c
-@@ -18,8 +18,10 @@
- #include <linux/mtd/mtd.h>
- #include <linux/bcm47xx_nvram.h>
- 
--#define NVRAM_MAGIC           0x48534C46      /* 'FLSH' */
--#define NVRAM_SPACE           0x8000
-+#define NVRAM_MAGIC                   0x48534C46      /* 'FLSH' */
-+#define NVRAM_SPACE                   0x8000
-+#define NVRAM_MAX_GPIO_ENTRIES                32
-+#define NVRAM_MAX_GPIO_VALUE_LEN      30
- 
- #define FLASH_MIN             0x00020000      /* Minimum flash size */
- 
-@@ -97,8 +99,8 @@ found:
-               pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
-                      header->len, NVRAM_SPACE);
- 
--      src = (u32 *) header;
--      dst = (u32 *) nvram_buf;
-+      src = (u32 *)header;
-+      dst = (u32 *)nvram_buf;
-       for (i = 0; i < sizeof(struct nvram_header); i += 4)
-               *dst++ = __raw_readl(src++);
-       for (; i < header->len && i < NVRAM_SPACE && i < size; i += 4)
-@@ -189,7 +191,8 @@ int bcm47xx_nvram_getenv(const char *nam
-       /* Look for name=value and return value */
-       var = &nvram_buf[sizeof(struct nvram_header)];
-       end = nvram_buf + sizeof(nvram_buf) - 2;
--      end[0] = end[1] = '\0';
-+      end[0] = '\0';
-+      end[1] = '\0';
-       for (; *var; var = value + strlen(value) + 1) {
-               data_left = end - var;
- 
-@@ -197,11 +200,10 @@ int bcm47xx_nvram_getenv(const char *nam
-               if (!eq)
-                       break;
-               value = eq + 1;
--              if ((eq - var) == strlen(name) &&
--                      strncmp(var, name, (eq - var)) == 0) {
-+              if (eq - var == strlen(name) &&
-+                  strncmp(var, name, eq - var) == 0)
-                       return snprintf(val, val_len, "%s", value);
-               }
--      }
-       return -ENOENT;
- }
- EXPORT_SYMBOL(bcm47xx_nvram_getenv);
-@@ -209,10 +211,11 @@ EXPORT_SYMBOL(bcm47xx_nvram_getenv);
- int bcm47xx_nvram_gpio_pin(const char *name)
- {
-       int i, err;
--      char nvram_var[10];
--      char buf[30];
-+      char nvram_var[] = "gpioXX";
-+      char buf[NVRAM_MAX_GPIO_VALUE_LEN];
- 
--      for (i = 0; i < 32; i++) {
-+      /* TODO: Optimize it to don't call getenv so many times */
-+      for (i = 0; i < NVRAM_MAX_GPIO_ENTRIES; i++) {
-               err = snprintf(nvram_var, sizeof(nvram_var), "gpio%i", i);
-               if (err <= 0)
-                       continue;
---- a/arch/mips/bcm47xx/prom.c
-+++ b/arch/mips/bcm47xx/prom.c
-@@ -35,7 +35,6 @@
- #include <bcm47xx.h>
- #include <bcm47xx_board.h>
- 
--
- static char bcm47xx_system_type[20] = "Broadcom BCM47XX";
- 
- const char *get_system_type(void)
-@@ -83,7 +82,7 @@ static __init void prom_init_mem(void)
-               /* Loop condition may be not enough, off may be over 1 MiB */
-               if (off + mem >= max) {
-                       mem = max;
--                      printk(KERN_DEBUG "assume 128MB RAM\n");
-+                      pr_debug("Assume 128MB RAM\n");
-                       break;
-               }
-               if (!memcmp(prom_init, prom_init + mem, 32))
---- a/arch/mips/bcm47xx/serial.c
-+++ b/arch/mips/bcm47xx/serial.c
-@@ -36,8 +36,8 @@ static int __init uart8250_init_ssb(void
-               struct plat_serial8250_port *p = &(uart8250_data[i]);
-               struct ssb_serial_port *ssb_port = &(mcore->serial_ports[i]);
- 
--              p->mapbase = (unsigned int) ssb_port->regs;
--              p->membase = (void *) ssb_port->regs;
-+              p->mapbase = (unsigned int)ssb_port->regs;
-+              p->membase = (void *)ssb_port->regs;
-               p->irq = ssb_port->irq + 2;
-               p->uartclk = ssb_port->baud_base;
-               p->regshift = ssb_port->reg_shift;
-@@ -62,8 +62,8 @@ static int __init uart8250_init_bcma(voi
-               struct bcma_serial_port *bcma_port;
-               bcma_port = &(cc->serial_ports[i]);
- 
--              p->mapbase = (unsigned int) bcma_port->regs;
--              p->membase = (void *) bcma_port->regs;
-+              p->mapbase = (unsigned int)bcma_port->regs;
-+              p->membase = (void *)bcma_port->regs;
-               p->irq = bcma_port->irq;
-               p->uartclk = bcma_port->baud_base;
-               p->regshift = bcma_port->reg_shift;
---- a/arch/mips/bcm47xx/setup.c
-+++ b/arch/mips/bcm47xx/setup.c
-@@ -52,7 +52,7 @@ EXPORT_SYMBOL(bcm47xx_bus_type);
- 
- static void bcm47xx_machine_restart(char *command)
- {
--      printk(KERN_ALERT "Please stand by while rebooting the system...\n");
-+      pr_alert("Please stand by while rebooting the system...\n");
-       local_irq_disable();
-       /* Set the watchdog timer to reset immediately */
-       switch (bcm47xx_bus_type) {
-@@ -107,7 +107,7 @@ static int bcm47xx_get_invariants(struct
-       char buf[20];
- 
-       /* Fill boardinfo structure */
--      memset(&(iv->boardinfo), 0 , sizeof(struct ssb_boardinfo));
-+      memset(&iv->boardinfo, 0 , sizeof(struct ssb_boardinfo));
- 
-       bcm47xx_fill_ssb_boardinfo(&iv->boardinfo, NULL);
- 
-@@ -126,7 +126,7 @@ static void __init bcm47xx_register_ssb(
-       char buf[100];
-       struct ssb_mipscore *mcore;
- 
--      err = ssb_bus_ssbbus_register(&(bcm47xx_bus.ssb), SSB_ENUM_BASE,
-+      err = ssb_bus_ssbbus_register(&bcm47xx_bus.ssb, SSB_ENUM_BASE,
-                                     bcm47xx_get_invariants);
-       if (err)
-               panic("Failed to initialize SSB bus (err %d)", err);
-@@ -136,7 +136,7 @@ static void __init bcm47xx_register_ssb(
-               if (strstr(buf, "console=ttyS1")) {
-                       struct ssb_serial_port port;
- 
--                      printk(KERN_DEBUG "Swapping serial ports!\n");
-+                      pr_debug("Swapping serial ports!\n");
-                       /* swap serial ports */
-                       memcpy(&port, &mcore->serial_ports[0], sizeof(port));
-                       memcpy(&mcore->serial_ports[0], &mcore->serial_ports[1],
-@@ -168,7 +168,7 @@ void __init plat_mem_setup(void)
-       struct cpuinfo_mips *c = &current_cpu_data;
- 
-       if ((c->cputype == CPU_74K) || (c->cputype == CPU_1074K)) {
--              printk(KERN_INFO "bcm47xx: using bcma bus\n");
-+              pr_info("Using bcma bus\n");
- #ifdef CONFIG_BCM47XX_BCMA
-               bcm47xx_bus_type = BCM47XX_BUS_TYPE_BCMA;
-               bcm47xx_sprom_register_fallbacks();
-@@ -179,7 +179,7 @@ void __init plat_mem_setup(void)
- #endif
- #endif
-       } else {
--              printk(KERN_INFO "bcm47xx: using ssb bus\n");
-+              pr_info("Using ssb bus\n");
- #ifdef CONFIG_BCM47XX_SSB
-               bcm47xx_bus_type = BCM47XX_BUS_TYPE_SSB;
-               bcm47xx_sprom_register_fallbacks();
---- a/arch/mips/bcm47xx/sprom.c
-+++ b/arch/mips/bcm47xx/sprom.c
-@@ -780,8 +780,8 @@ void bcm47xx_fill_sprom(struct ssb_sprom
-               bcm47xx_fill_sprom_path_r4589(sprom, prefix, fallback);
-               break;
-       default:
--              pr_warn("Unsupported SPROM revision %d detected. Will extract"
--                      " v1\n", sprom->revision);
-+              pr_warn("Unsupported SPROM revision %d detected. Will extract v1\n",
-+                      sprom->revision);
-               sprom->revision = 1;
-               bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
-               bcm47xx_fill_sprom_r12389(sprom, prefix, fallback);
-@@ -828,7 +828,7 @@ static int bcm47xx_get_sprom_ssb(struct
-               bcm47xx_fill_sprom(out, prefix, false);
-               return 0;
-       } else {
--              pr_warn("bcm47xx: unable to fill SPROM for given bustype.\n");
-+              pr_warn("Unable to fill SPROM for given bustype.\n");
-               return -EINVAL;
-       }
- }
-@@ -893,7 +893,7 @@ static int bcm47xx_get_sprom_bcma(struct
-               }
-               return 0;
-       default:
--              pr_warn("bcm47xx: unable to fill SPROM for given bustype.\n");
-+              pr_warn("Unable to fill SPROM for given bustype.\n");
-               return -EINVAL;
-       }
- }
---- a/arch/mips/bcm47xx/time.c
-+++ b/arch/mips/bcm47xx/time.c
-@@ -22,7 +22,6 @@
-  *  675 Mass Ave, Cambridge, MA 02139, USA.
-  */
- 
--
- #include <linux/init.h>
- #include <linux/ssb/ssb.h>
- #include <asm/time.h>

diff --git a/target/linux/brcm47xx/patches-4.0/030-07-MIPS-BCM47XX-Include-io.h-directly-and-fix-brace-ind.patch b/target/linux/brcm47xx/patches-4.0/030-07-MIPS-BCM47XX-Include-io.h-directly-and-fix-brace-ind.patch
deleted file mode 100644 (file)
index 6f96ee0..0000000
--- a/target/linux/brcm47xx/patches-4.0/030-07-MIPS-BCM47XX-Include-io.h-directly-and-fix-brace-ind.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 50c979109c484c07358a1ac75b99df36d563c132 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Date: Wed, 1 Apr 2015 08:23:03 +0200
-Subject: [PATCH] MIPS: BCM47XX: Include io.h directly and fix brace indent
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We use IO functions like readl & ioremap_nocache, so include linux/io.h
-
-Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
-Cc: linux-mips@linux-mips.org
-Cc: Hauke Mehrtens <hauke@hauke-m.de>
-Patchwork: https://patchwork.linux-mips.org/patch/9650/
-Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
----
- arch/mips/bcm47xx/nvram.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/arch/mips/bcm47xx/nvram.c
-+++ b/arch/mips/bcm47xx/nvram.c
-@@ -11,6 +11,7 @@
-  * option) any later version.
-  */
- 
-+#include <linux/io.h>
- #include <linux/types.h>
- #include <linux/module.h>
- #include <linux/kernel.h>
-@@ -203,7 +204,7 @@ int bcm47xx_nvram_getenv(const char *nam
-               if (eq - var == strlen(name) &&
-                   strncmp(var, name, eq - var) == 0)
-                       return snprintf(val, val_len, "%s", value);
--              }
-+      }
-       return -ENOENT;
- }
- EXPORT_SYMBOL(bcm47xx_nvram_getenv);

diff --git a/target/linux/brcm47xx/patches-4.0/030-08-MIPS-BCM47XX-Increase-NVRAM-buffer-size-to-64-KiB.patch b/target/linux/brcm47xx/patches-4.0/030-08-MIPS-BCM47XX-Increase-NVRAM-buffer-size-to-64-KiB.patch
deleted file mode 100644 (file)
index a7cc110..0000000
--- a/target/linux/brcm47xx/patches-4.0/030-08-MIPS-BCM47XX-Increase-NVRAM-buffer-size-to-64-KiB.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 6ab7c29099390b3d23c97f14498fd26a5ef6b22b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Date: Wed, 1 Apr 2015 08:23:04 +0200
-Subject: [PATCH] MIPS: BCM47XX: Increase NVRAM buffer size to 64 KiB
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-For years Broadcom devices use 64 KiB NVRAM partition size and some of
-them indeed have it filled in more than 50%. This change allows reading
-whole NVRAM e.g. on Netgear WNDR4500 and Netgear R8000.
-
-Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
-Cc: linux-mips@linux-mips.org
-Cc: Hauke Mehrtens <hauke@hauke-m.de>
-Patchwork: https://patchwork.linux-mips.org/patch/9651/
-Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
----
- arch/mips/bcm47xx/nvram.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/mips/bcm47xx/nvram.c
-+++ b/arch/mips/bcm47xx/nvram.c
-@@ -20,7 +20,7 @@
- #include <linux/bcm47xx_nvram.h>
- 
- #define NVRAM_MAGIC                   0x48534C46      /* 'FLSH' */
--#define NVRAM_SPACE                   0x8000
-+#define NVRAM_SPACE                   0x10000
- #define NVRAM_MAX_GPIO_ENTRIES                32
- #define NVRAM_MAX_GPIO_VALUE_LEN      30
- 

diff --git a/target/linux/brcm47xx/patches-4.0/030-09-MIPS-BCM47XX-Don-t-try-guessing-NVRAM-size-on-MTD-pa.patch b/target/linux/brcm47xx/patches-4.0/030-09-MIPS-BCM47XX-Don-t-try-guessing-NVRAM-size-on-MTD-pa.patch
deleted file mode 100644 (file)
index c40c8b7..0000000
--- a/target/linux/brcm47xx/patches-4.0/030-09-MIPS-BCM47XX-Don-t-try-guessing-NVRAM-size-on-MTD-pa.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 40d12172c8a5c2f3fc39642fc564b053575cd000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Date: Wed, 1 Apr 2015 08:23:05 +0200
-Subject: [PATCH] MIPS: BCM47XX: Don't try guessing NVRAM size on MTD partition
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When dealing with whole flash content (bcm47xx_nvram_init_from_mem) we
-need to find NVRAM start trying various partition sizes (nvram_sizes).
-This is not needed when using MTD as we have direct partition access.
-
-Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
-Cc: linux-mips@linux-mips.org
-Cc: Hauke Mehrtens <hauke@hauke-m.de>
-Patchwork: https://patchwork.linux-mips.org/patch/9652/
-Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
----
- arch/mips/bcm47xx/nvram.c | 36 ++++++++++++++----------------------
- 1 file changed, 14 insertions(+), 22 deletions(-)
-
---- a/arch/mips/bcm47xx/nvram.c
-+++ b/arch/mips/bcm47xx/nvram.c
-@@ -139,36 +139,28 @@ static int nvram_init(void)
-       struct mtd_info *mtd;
-       struct nvram_header header;
-       size_t bytes_read;
--      int err, i;
-+      int err;
- 
-       mtd = get_mtd_device_nm("nvram");
-       if (IS_ERR(mtd))
-               return -ENODEV;
- 
--      for (i = 0; i < ARRAY_SIZE(nvram_sizes); i++) {
--              loff_t from = mtd->size - nvram_sizes[i];
--
--              if (from < 0)
--                      continue;
-+      err = mtd_read(mtd, 0, sizeof(header), &bytes_read, (uint8_t *)&header);
-+      if (!err && header.magic == NVRAM_MAGIC) {
-+              u8 *dst = (uint8_t *)nvram_buf;
-+              size_t len = header.len;
-+
-+              if (header.len > NVRAM_SPACE) {
-+                      pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
-+                              header.len, NVRAM_SPACE);
-+                      len = NVRAM_SPACE;
-+              }
- 
--              err = mtd_read(mtd, from, sizeof(header), &bytes_read,
--                             (uint8_t *)&header);
--              if (!err && header.magic == NVRAM_MAGIC) {
--                      u8 *dst = (uint8_t *)nvram_buf;
--                      size_t len = header.len;
--
--                      if (header.len > NVRAM_SPACE) {
--                              pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
--                                     header.len, NVRAM_SPACE);
--                              len = NVRAM_SPACE;
--                      }
--
--                      err = mtd_read(mtd, from, len, &bytes_read, dst);
--                      if (err)
--                              return err;
-+              err = mtd_read(mtd, 0, len, &bytes_read, dst);
-+              if (err)
-+                      return err;
- 
--                      return 0;
--              }
-+              return 0;
-       }
- #endif
- 

diff --git a/target/linux/brcm47xx/patches-4.0/030-10-MIPS-BCM47xx-Keep-ID-entries-for-non-standard-device.patch b/target/linux/brcm47xx/patches-4.0/030-10-MIPS-BCM47xx-Keep-ID-entries-for-non-standard-device.patch
deleted file mode 100644 (file)
index 8918811..0000000
--- a/target/linux/brcm47xx/patches-4.0/030-10-MIPS-BCM47xx-Keep-ID-entries-for-non-standard-device.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 7515c6f1da334184c3ece06e6f61461086d8e2b1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Date: Wed, 1 Apr 2015 18:18:01 +0200
-Subject: [PATCH] MIPS: BCM47xx: Keep ID entries for non-standard devices
- together
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
-Cc: linux-mips@linux-mips.org
-Cc: Hauke Mehrtens <hauke@hauke-m.de>
-Patchwork: https://patchwork.linux-mips.org/patch/9655/
-Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
----
- arch/mips/bcm47xx/board.c | 48 ++++++++++++++++++++---------------------------
- 1 file changed, 20 insertions(+), 28 deletions(-)
-
---- a/arch/mips/bcm47xx/board.c
-+++ b/arch/mips/bcm47xx/board.c
-@@ -40,20 +40,6 @@ struct bcm47xx_board_type_list1 bcm47xx_
-       { {0}, NULL},
- };
- 
--/* model_no */
--static const
--struct bcm47xx_board_type_list1 bcm47xx_board_list_model_no[] __initconst = {
--      {{BCM47XX_BOARD_ASUS_WL700GE, "Asus WL700"}, "WL700"},
--      { {0}, NULL},
--};
--
--/* machine_name */
--static const
--struct bcm47xx_board_type_list1 bcm47xx_board_list_machine_name[] __initconst = {
--      {{BCM47XX_BOARD_LINKSYS_WRTSL54GS, "Linksys WRTSL54GS"}, "WRTSL54GS"},
--      { {0}, NULL},
--};
--
- /* hardware_version */
- static const
- struct bcm47xx_board_type_list1 bcm47xx_board_list_hardware_version[] __initconst = {
-@@ -202,6 +188,18 @@ struct bcm47xx_board_type_list2 bcm47xx_
-       { {0}, NULL},
- };
- 
-+/*
-+ * Some devices don't use any common NVRAM entry for identification and they
-+ * have only one model specific variable.
-+ * They don't deserve own arrays, let's group them there using key-value array.
-+ */
-+static const
-+struct bcm47xx_board_type_list2 bcm47xx_board_list_key_value[] __initconst = {
-+      {{BCM47XX_BOARD_ASUS_WL700GE, "Asus WL700"}, "model_no", "WL700"},
-+      {{BCM47XX_BOARD_LINKSYS_WRTSL54GS, "Linksys WRTSL54GS"}, "machine_name", "WRTSL54GS"},
-+      { {0}, NULL},
-+};
-+
- static const
- struct bcm47xx_board_type bcm47xx_board_unknown[] __initconst = {
-       {BCM47XX_BOARD_UNKNOWN, "Unknown Board"},
-@@ -225,20 +223,6 @@ static __init const struct bcm47xx_board
-               }
-       }
- 
--      if (bcm47xx_nvram_getenv("model_no", buf1, sizeof(buf1)) >= 0) {
--              for (e1 = bcm47xx_board_list_model_no; e1->value1; e1++) {
--                      if (strstarts(buf1, e1->value1))
--                              return &e1->board;
--              }
--      }
--
--      if (bcm47xx_nvram_getenv("machine_name", buf1, sizeof(buf1)) >= 0) {
--              for (e1 = bcm47xx_board_list_machine_name; e1->value1; e1++) {
--                      if (strstarts(buf1, e1->value1))
--                              return &e1->board;
--              }
--      }
--
-       if (bcm47xx_nvram_getenv("hardware_version", buf1, sizeof(buf1)) >= 0) {
-               for (e1 = bcm47xx_board_list_hardware_version; e1->value1; e1++) {
-                       if (strstarts(buf1, e1->value1))
-@@ -314,6 +298,14 @@ static __init const struct bcm47xx_board
-                               return &e2->board;
-               }
-       }
-+
-+      for (e2 = bcm47xx_board_list_key_value; e2->value1; e2++) {
-+              if (bcm47xx_nvram_getenv(e2->value1, buf1, sizeof(buf1)) >= 0) {
-+                      if (!strcmp(buf1, e2->value2))
-+                              return &e2->board;
-+              }
-+      }
-+
-       return bcm47xx_board_unknown;
- }
- 

diff --git a/target/linux/brcm47xx/patches-4.0/030-11-MIPS-BCM47xx-Devices-database-update-for-4.1-or-4.2.patch b/target/linux/brcm47xx/patches-4.0/030-11-MIPS-BCM47xx-Devices-database-update-for-4.1-or-4.2.patch
deleted file mode 100644 (file)
index 6e6166c..0000000
--- a/target/linux/brcm47xx/patches-4.0/030-11-MIPS-BCM47xx-Devices-database-update-for-4.1-or-4.2.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From 160f14312b0b7d35759535b1f60be79247b263c4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Date: Wed, 1 Apr 2015 18:18:02 +0200
-Subject: [PATCH] MIPS: BCM47xx: Devices database update for 4.1 (or 4.2?)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
-Cc: linux-mips@linux-mips.org
-Cc: Hauke Mehrtens <hauke@hauke-m.de>
-Patchwork: https://patchwork.linux-mips.org/patch/9656/
-Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
----
- arch/mips/bcm47xx/board.c                          |  4 ++++
- arch/mips/bcm47xx/buttons.c                        | 18 ++++++++++++++++++
- arch/mips/bcm47xx/leds.c                           | 10 ++++++++++
- arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h |  4 ++++
- 4 files changed, 36 insertions(+)
-
---- a/arch/mips/bcm47xx/board.c
-+++ b/arch/mips/bcm47xx/board.c
-@@ -151,9 +151,11 @@ static const
- struct bcm47xx_board_type_list1 bcm47xx_board_list_board_id[] __initconst = {
-       {{BCM47XX_BOARD_NETGEAR_WGR614V8, "Netgear WGR614 V8"}, "U12H072T00_NETGEAR"},
-       {{BCM47XX_BOARD_NETGEAR_WGR614V9, "Netgear WGR614 V9"}, "U12H094T00_NETGEAR"},
-+      {{BCM47XX_BOARD_NETGEAR_WGR614_V10, "Netgear WGR614 V10"}, "U12H139T01_NETGEAR"},
-       {{BCM47XX_BOARD_NETGEAR_WNDR3300, "Netgear WNDR3300"}, "U12H093T00_NETGEAR"},
-       {{BCM47XX_BOARD_NETGEAR_WNDR3400V1, "Netgear WNDR3400 V1"}, "U12H155T00_NETGEAR"},
-       {{BCM47XX_BOARD_NETGEAR_WNDR3400V2, "Netgear WNDR3400 V2"}, "U12H187T00_NETGEAR"},
-+      {{BCM47XX_BOARD_NETGEAR_WNDR3400_V3, "Netgear WNDR3400 V3"}, "U12H208T00_NETGEAR"},
-       {{BCM47XX_BOARD_NETGEAR_WNDR3400VCNA, "Netgear WNDR3400 Vcna"}, "U12H155T01_NETGEAR"},
-       {{BCM47XX_BOARD_NETGEAR_WNDR3700V3, "Netgear WNDR3700 V3"}, "U12H194T00_NETGEAR"},
-       {{BCM47XX_BOARD_NETGEAR_WNDR4000, "Netgear WNDR4000"}, "U12H181T00_NETGEAR"},
-@@ -196,6 +198,8 @@ struct bcm47xx_board_type_list2 bcm47xx_
- static const
- struct bcm47xx_board_type_list2 bcm47xx_board_list_key_value[] __initconst = {
-       {{BCM47XX_BOARD_ASUS_WL700GE, "Asus WL700"}, "model_no", "WL700"},
-+      {{BCM47XX_BOARD_LINKSYS_WRT300N_V1, "Linksys WRT300N V1"}, "router_name", "WRT300N"},
-+      {{BCM47XX_BOARD_LINKSYS_WRT600N_V11, "Linksys WRT600N V1.1"}, "Model_Name", "WRT600N"},
-       {{BCM47XX_BOARD_LINKSYS_WRTSL54GS, "Linksys WRTSL54GS"}, "machine_name", "WRTSL54GS"},
-       { {0}, NULL},
- };
---- a/arch/mips/bcm47xx/buttons.c
-+++ b/arch/mips/bcm47xx/buttons.c
-@@ -252,6 +252,12 @@ bcm47xx_buttons_linksys_wrt160nv3[] __in
- };
- 
- static const struct gpio_keys_button
-+bcm47xx_buttons_linksys_wrt300n_v1[] __initconst = {
-+      BCM47XX_GPIO_KEY(4, KEY_WPS_BUTTON),
-+      BCM47XX_GPIO_KEY(6, KEY_RESTART),
-+};
-+
-+static const struct gpio_keys_button
- bcm47xx_buttons_linksys_wrt300nv11[] __initconst = {
-       BCM47XX_GPIO_KEY(4, KEY_UNKNOWN),
-       BCM47XX_GPIO_KEY(6, KEY_RESTART),
-@@ -327,6 +333,12 @@ bcm47xx_buttons_netgear_wndr3400v1[] __i
- };
- 
- static const struct gpio_keys_button
-+bcm47xx_buttons_netgear_wndr3400_v3[] __initconst = {
-+      BCM47XX_GPIO_KEY(12, KEY_RESTART),
-+      BCM47XX_GPIO_KEY(23, KEY_WPS_BUTTON),
-+};
-+
-+static const struct gpio_keys_button
- bcm47xx_buttons_netgear_wndr3700v3[] __initconst = {
-       BCM47XX_GPIO_KEY(2, KEY_RFKILL),
-       BCM47XX_GPIO_KEY(3, KEY_RESTART),
-@@ -516,6 +528,9 @@ int __init bcm47xx_buttons_register(void
-       case BCM47XX_BOARD_LINKSYS_WRT160NV3:
-               err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt160nv3);
-               break;
-+      case BCM47XX_BOARD_LINKSYS_WRT300N_V1:
-+              err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt300n_v1);
-+              break;
-       case BCM47XX_BOARD_LINKSYS_WRT300NV11:
-               err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt300nv11);
-               break;
-@@ -557,6 +572,9 @@ int __init bcm47xx_buttons_register(void
-       case BCM47XX_BOARD_NETGEAR_WNDR3400V1:
-               err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wndr3400v1);
-               break;
-+      case BCM47XX_BOARD_NETGEAR_WNDR3400_V3:
-+              err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wndr3400_v3);
-+              break;
-       case BCM47XX_BOARD_NETGEAR_WNDR3700V3:
-               err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wndr3700v3);
-               break;
---- a/arch/mips/bcm47xx/leds.c
-+++ b/arch/mips/bcm47xx/leds.c
-@@ -292,6 +292,13 @@ bcm47xx_leds_linksys_wrt160nv3[] __initc
- };
- 
- static const struct gpio_led
-+bcm47xx_leds_linksys_wrt300n_v1[] __initconst = {
-+      BCM47XX_GPIO_LED(1, "green", "power", 0, LEDS_GPIO_DEFSTATE_ON),
-+      BCM47XX_GPIO_LED(3, "amber", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
-+      BCM47XX_GPIO_LED(5, "green", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
-+};
-+
-+static const struct gpio_led
- bcm47xx_leds_linksys_wrt300nv11[] __initconst = {
-       BCM47XX_GPIO_LED(1, "unk", "power", 0, LEDS_GPIO_DEFSTATE_ON),
-       BCM47XX_GPIO_LED(3, "amber", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
-@@ -585,6 +592,9 @@ void __init bcm47xx_leds_register(void)
-       case BCM47XX_BOARD_LINKSYS_WRT160NV3:
-               bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt160nv3);
-               break;
-+      case BCM47XX_BOARD_LINKSYS_WRT300N_V1:
-+              bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt300n_v1);
-+              break;
-       case BCM47XX_BOARD_LINKSYS_WRT300NV11:
-               bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt300nv11);
-               break;
---- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
-+++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
-@@ -67,6 +67,7 @@ enum bcm47xx_board {
-       BCM47XX_BOARD_LINKSYS_WRT150NV11,
-       BCM47XX_BOARD_LINKSYS_WRT160NV1,
-       BCM47XX_BOARD_LINKSYS_WRT160NV3,
-+      BCM47XX_BOARD_LINKSYS_WRT300N_V1,
-       BCM47XX_BOARD_LINKSYS_WRT300NV11,
-       BCM47XX_BOARD_LINKSYS_WRT310NV1,
-       BCM47XX_BOARD_LINKSYS_WRT310NV2,
-@@ -74,6 +75,7 @@ enum bcm47xx_board {
-       BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0101,
-       BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467,
-       BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0708,
-+      BCM47XX_BOARD_LINKSYS_WRT600N_V11,
-       BCM47XX_BOARD_LINKSYS_WRT610NV1,
-       BCM47XX_BOARD_LINKSYS_WRT610NV2,
-       BCM47XX_BOARD_LINKSYS_WRTSL54GS,
-@@ -86,9 +88,11 @@ enum bcm47xx_board {
- 
-       BCM47XX_BOARD_NETGEAR_WGR614V8,
-       BCM47XX_BOARD_NETGEAR_WGR614V9,
-+      BCM47XX_BOARD_NETGEAR_WGR614_V10,
-       BCM47XX_BOARD_NETGEAR_WNDR3300,
-       BCM47XX_BOARD_NETGEAR_WNDR3400V1,
-       BCM47XX_BOARD_NETGEAR_WNDR3400V2,
-+      BCM47XX_BOARD_NETGEAR_WNDR3400_V3,
-       BCM47XX_BOARD_NETGEAR_WNDR3400VCNA,
-       BCM47XX_BOARD_NETGEAR_WNDR3700V3,
-       BCM47XX_BOARD_NETGEAR_WNDR4000,

diff --git a/target/linux/brcm47xx/patches-4.0/030-12-MIPS-BCM47xx-Add-generic-function-filling-SPROM-entr.patch b/target/linux/brcm47xx/patches-4.0/030-12-MIPS-BCM47xx-Add-generic-function-filling-SPROM-entr.patch
deleted file mode 100644 (file)
index 482aa49..0000000
--- a/target/linux/brcm47xx/patches-4.0/030-12-MIPS-BCM47xx-Add-generic-function-filling-SPROM-entr.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From d55a52ccf8f80cdf51af2c5c6e56c825f98c4f85 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Date: Thu, 2 Apr 2015 09:13:49 +0200
-Subject: [PATCH] MIPS: BCM47xx: Add generic function filling SPROM entries
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Handling many SPROM revisions became messy, we have tons of functions
-specific to various revision groups which are quite hard to track.
-For years there is yet another revision 11 asking for support, but
-adding it in current the form would make things even worse.
-To resolve this problem let's add new function with table-like entries
-that will contain revision bitmask for every SPROM variable.
-
-Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
-Cc: linux-mips@linux-mips.org
-Cc: Hauke Mehrtens <hauke@hauke-m.de>
-Cc: Jonas Gorski <jonas.gorski@gmail.com>
-Patchwork: https://patchwork.linux-mips.org/patch/9659/
-Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
----
- arch/mips/bcm47xx/sprom.c | 32 +++++++++++++++++++++++++++++---
- 1 file changed, 29 insertions(+), 3 deletions(-)
-
---- a/arch/mips/bcm47xx/sprom.c
-+++ b/arch/mips/bcm47xx/sprom.c
-@@ -180,6 +180,33 @@ static void nvram_read_alpha2(const char
-       memcpy(val, buf, 2);
- }
- 
-+/* This is one-function-only macro, it uses local "sprom" variable! */
-+#define ENTRY(_revmask, _type, _prefix, _name, _val, _allset, _fallback) \
-+      if (_revmask & BIT(sprom->revision)) \
-+              nvram_read_ ## _type(_prefix, NULL, _name, &sprom->_val, \
-+                                   _allset, _fallback)
-+/*
-+ * Special version of filling function that can be safely called for any SPROM
-+ * revision. For every NVRAM to SPROM mapping it contains bitmask of revisions
-+ * for which the mapping is valid.
-+ * It obviously requires some hexadecimal/bitmasks knowledge, but allows
-+ * writing cleaner code (easy revisions handling).
-+ * Note that while SPROM revision 0 was never used, we still keep BIT(0)
-+ * reserved for it, just to keep numbering sane.
-+ */
-+static void bcm47xx_sprom_fill_auto(struct ssb_sprom *sprom,
-+                                  const char *prefix, bool fallback)
-+{
-+      const char *pre = prefix;
-+      bool fb = fallback;
-+
-+      ENTRY(0xfffffffe, u16, pre, "boardrev", board_rev, 0, true);
-+      ENTRY(0xfffffffe, u16, pre, "boardnum", board_num, 0, fb);
-+
-+      /* TODO: Move more mappings here */
-+}
-+#undef ENTRY /* It's specififc, uses local variable, don't use it (again). */
-+
- static void bcm47xx_fill_sprom_r1234589(struct ssb_sprom *sprom,
-                                       const char *prefix, bool fallback)
- {
-@@ -714,9 +741,6 @@ static void bcm47xx_fill_sprom_ethernet(
- static void bcm47xx_fill_board_data(struct ssb_sprom *sprom, const char *prefix,
-                                   bool fallback)
- {
--      nvram_read_u16(prefix, NULL, "boardrev", &sprom->board_rev, 0, true);
--      nvram_read_u16(prefix, NULL, "boardnum", &sprom->board_num, 0,
--                     fallback);
-       nvram_read_u16(prefix, NULL, "boardtype", &sprom->board_type, 0, true);
-       nvram_read_u32_2(prefix, "boardflags", &sprom->boardflags_lo,
-                        &sprom->boardflags_hi, fallback);
-@@ -787,6 +811,8 @@ void bcm47xx_fill_sprom(struct ssb_sprom
-               bcm47xx_fill_sprom_r12389(sprom, prefix, fallback);
-               bcm47xx_fill_sprom_r1(sprom, prefix, fallback);
-       }
-+
-+      bcm47xx_sprom_fill_auto(sprom, prefix, fallback);
- }
- 
- #ifdef CONFIG_BCM47XX_SSB

diff --git a/target/linux/brcm47xx/patches-4.0/030-13-MIPS-BCM47xx-Move-filling-most-of-SPROM-to-the-gener.patch b/target/linux/brcm47xx/patches-4.0/030-13-MIPS-BCM47xx-Move-filling-most-of-SPROM-to-the-gener.patch
deleted file mode 100644 (file)
index 6a2d64f..0000000
--- a/target/linux/brcm47xx/patches-4.0/030-13-MIPS-BCM47xx-Move-filling-most-of-SPROM-to-the-gener.patch
+++ /dev/null
@@ -1,711 +0,0 @@
-From e754dfcfe37f49c9249152e2e98e58887a4d87c8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Date: Thu, 2 Apr 2015 12:30:24 +0200
-Subject: [PATCH] MIPS: BCM47xx: Move filling most of SPROM to the generic
- function
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This simplifies code a lot by dropping many per-revision-group
-functions. There are still some paths left that use uncommon NVRAM read
-helpers or fill arrays. They will need to be handled in separated patch.
-
-I've tested this (by printing SPROM content) for regressions on:
-1) BCM4704 (SPROM revision 2)
-2) BCM4706 (SPROM revision 8 plus 11 & 9 on extra WiFi cards)
-The only difference is not reading board_type from SPROM rev 11 which is
-unsupported and treated as rev 1. This change for rev 1 is expected.
-
-Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
-Cc: linux-mips@linux-mips.org
-Cc: Hauke Mehrtens <hauke@hauke-m.de>
-Cc: Jonas Gorski <jonas.gorski@gmail.com>
-Patchwork: https://patchwork.linux-mips.org/patch/9660/
-Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
----
- arch/mips/bcm47xx/sprom.c | 605 ++++++++++++++++------------------------------
- 1 file changed, 204 insertions(+), 401 deletions(-)
-
---- a/arch/mips/bcm47xx/sprom.c
-+++ b/arch/mips/bcm47xx/sprom.c
-@@ -201,9 +201,211 @@ static void bcm47xx_sprom_fill_auto(stru
-       bool fb = fallback;
- 
-       ENTRY(0xfffffffe, u16, pre, "boardrev", board_rev, 0, true);
-+      ENTRY(0x00000002, u16, pre, "boardflags", boardflags_lo, 0, fb);
-+      ENTRY(0xfffffffc, u16, pre, "boardtype", board_type, 0, true);
-       ENTRY(0xfffffffe, u16, pre, "boardnum", board_num, 0, fb);
-+      ENTRY(0x00000002, u8, pre, "cc", country_code, 0, fb);
-+      ENTRY(0xfffffff8, u8, pre, "regrev", regrev, 0, fb);
- 
--      /* TODO: Move more mappings here */
-+      ENTRY(0xfffffffe, u8, pre, "ledbh0", gpio0, 0xff, fb);
-+      ENTRY(0xfffffffe, u8, pre, "ledbh1", gpio1, 0xff, fb);
-+      ENTRY(0xfffffffe, u8, pre, "ledbh2", gpio2, 0xff, fb);
-+      ENTRY(0xfffffffe, u8, pre, "ledbh3", gpio3, 0xff, fb);
-+
-+      ENTRY(0x0000070e, u16, pre, "pa0b0", pa0b0, 0, fb);
-+      ENTRY(0x0000070e, u16, pre, "pa0b1", pa0b1, 0, fb);
-+      ENTRY(0x0000070e, u16, pre, "pa0b2", pa0b2, 0, fb);
-+      ENTRY(0x0000070e, u8, pre, "pa0itssit", itssi_bg, 0, fb);
-+      ENTRY(0x0000070e, u8, pre, "pa0maxpwr", maxpwr_bg, 0, fb);
-+
-+      ENTRY(0x0000070c, u8, pre, "opo", opo, 0, fb);
-+      ENTRY(0xfffffffe, u8, pre, "aa2g", ant_available_bg, 0, fb);
-+      ENTRY(0xfffffffe, u8, pre, "aa5g", ant_available_a, 0, fb);
-+      ENTRY(0x000007fe, s8, pre, "ag0", antenna_gain.a0, 0, fb);
-+      ENTRY(0x000007fe, s8, pre, "ag1", antenna_gain.a1, 0, fb);
-+      ENTRY(0x000007f0, s8, pre, "ag2", antenna_gain.a2, 0, fb);
-+      ENTRY(0x000007f0, s8, pre, "ag3", antenna_gain.a3, 0, fb);
-+
-+      ENTRY(0x0000070e, u16, pre, "pa1b0", pa1b0, 0, fb);
-+      ENTRY(0x0000070e, u16, pre, "pa1b1", pa1b1, 0, fb);
-+      ENTRY(0x0000070e, u16, pre, "pa1b2", pa1b2, 0, fb);
-+      ENTRY(0x0000070c, u16, pre, "pa1lob0", pa1lob0, 0, fb);
-+      ENTRY(0x0000070c, u16, pre, "pa1lob1", pa1lob1, 0, fb);
-+      ENTRY(0x0000070c, u16, pre, "pa1lob2", pa1lob2, 0, fb);
-+      ENTRY(0x0000070c, u16, pre, "pa1hib0", pa1hib0, 0, fb);
-+      ENTRY(0x0000070c, u16, pre, "pa1hib1", pa1hib1, 0, fb);
-+      ENTRY(0x0000070c, u16, pre, "pa1hib2", pa1hib2, 0, fb);
-+      ENTRY(0x0000070e, u8, pre, "pa1itssit", itssi_a, 0, fb);
-+      ENTRY(0x0000070e, u8, pre, "pa1maxpwr", maxpwr_a, 0, fb);
-+      ENTRY(0x0000070c, u8, pre, "pa1lomaxpwr", maxpwr_al, 0, fb);
-+      ENTRY(0x0000070c, u8, pre, "pa1himaxpwr", maxpwr_ah, 0, fb);
-+
-+      ENTRY(0x00000708, u8, pre, "bxa2g", bxa2g, 0, fb);
-+      ENTRY(0x00000708, u8, pre, "rssisav2g", rssisav2g, 0, fb);
-+      ENTRY(0x00000708, u8, pre, "rssismc2g", rssismc2g, 0, fb);
-+      ENTRY(0x00000708, u8, pre, "rssismf2g", rssismf2g, 0, fb);
-+      ENTRY(0x00000708, u8, pre, "bxa5g", bxa5g, 0, fb);
-+      ENTRY(0x00000708, u8, pre, "rssisav5g", rssisav5g, 0, fb);
-+      ENTRY(0x00000708, u8, pre, "rssismc5g", rssismc5g, 0, fb);
-+      ENTRY(0x00000708, u8, pre, "rssismf5g", rssismf5g, 0, fb);
-+      ENTRY(0x00000708, u8, pre, "tri2g", tri2g, 0, fb);
-+      ENTRY(0x00000708, u8, pre, "tri5g", tri5g, 0, fb);
-+      ENTRY(0x00000708, u8, pre, "tri5gl", tri5gl, 0, fb);
-+      ENTRY(0x00000708, u8, pre, "tri5gh", tri5gh, 0, fb);
-+      ENTRY(0x00000708, s8, pre, "rxpo2g", rxpo2g, 0, fb);
-+      ENTRY(0x00000708, s8, pre, "rxpo5g", rxpo5g, 0, fb);
-+      ENTRY(0xfffffff0, u8, pre, "txchain", txchain, 0xf, fb);
-+      ENTRY(0xfffffff0, u8, pre, "rxchain", rxchain, 0xf, fb);
-+      ENTRY(0xfffffff0, u8, pre, "antswitch", antswitch, 0xff, fb);
-+      ENTRY(0x00000700, u8, pre, "tssipos2g", fem.ghz2.tssipos, 0, fb);
-+      ENTRY(0x00000700, u8, pre, "extpagain2g", fem.ghz2.extpa_gain, 0, fb);
-+      ENTRY(0x00000700, u8, pre, "pdetrange2g", fem.ghz2.pdet_range, 0, fb);
-+      ENTRY(0x00000700, u8, pre, "triso2g", fem.ghz2.tr_iso, 0, fb);
-+      ENTRY(0x00000700, u8, pre, "antswctl2g", fem.ghz2.antswlut, 0, fb);
-+      ENTRY(0x00000700, u8, pre, "tssipos5g", fem.ghz5.tssipos, 0, fb);
-+      ENTRY(0x00000700, u8, pre, "extpagain5g", fem.ghz5.extpa_gain, 0, fb);
-+      ENTRY(0x00000700, u8, pre, "pdetrange5g", fem.ghz5.pdet_range, 0, fb);
-+      ENTRY(0x00000700, u8, pre, "triso5g", fem.ghz5.tr_iso, 0, fb);
-+      ENTRY(0x00000700, u8, pre, "antswctl5g", fem.ghz5.antswlut, 0, fb);
-+      ENTRY(0x000000f0, u8, pre, "txpid2ga0", txpid2g[0], 0, fb);
-+      ENTRY(0x000000f0, u8, pre, "txpid2ga1", txpid2g[1], 0, fb);
-+      ENTRY(0x000000f0, u8, pre, "txpid2ga2", txpid2g[2], 0, fb);
-+      ENTRY(0x000000f0, u8, pre, "txpid2ga3", txpid2g[3], 0, fb);
-+      ENTRY(0x000000f0, u8, pre, "txpid5ga0", txpid5g[0], 0, fb);
-+      ENTRY(0x000000f0, u8, pre, "txpid5ga1", txpid5g[1], 0, fb);
-+      ENTRY(0x000000f0, u8, pre, "txpid5ga2", txpid5g[2], 0, fb);
-+      ENTRY(0x000000f0, u8, pre, "txpid5ga3", txpid5g[3], 0, fb);
-+      ENTRY(0x000000f0, u8, pre, "txpid5gla0", txpid5gl[0], 0, fb);
-+      ENTRY(0x000000f0, u8, pre, "txpid5gla1", txpid5gl[1], 0, fb);
-+      ENTRY(0x000000f0, u8, pre, "txpid5gla2", txpid5gl[2], 0, fb);
-+      ENTRY(0x000000f0, u8, pre, "txpid5gla3", txpid5gl[3], 0, fb);
-+      ENTRY(0x000000f0, u8, pre, "txpid5gha0", txpid5gh[0], 0, fb);
-+      ENTRY(0x000000f0, u8, pre, "txpid5gha1", txpid5gh[1], 0, fb);
-+      ENTRY(0x000000f0, u8, pre, "txpid5gha2", txpid5gh[2], 0, fb);
-+      ENTRY(0x000000f0, u8, pre, "txpid5gha3", txpid5gh[3], 0, fb);
-+
-+      ENTRY(0xffffff00, u8, pre, "tempthresh", tempthresh, 0, fb);
-+      ENTRY(0xffffff00, u8, pre, "tempoffset", tempoffset, 0, fb);
-+      ENTRY(0xffffff00, u16, pre, "rawtempsense", rawtempsense, 0, fb);
-+      ENTRY(0xffffff00, u8, pre, "measpower", measpower, 0, fb);
-+      ENTRY(0xffffff00, u8, pre, "tempsense_slope", tempsense_slope, 0, fb);
-+      ENTRY(0xffffff00, u8, pre, "tempcorrx", tempcorrx, 0, fb);
-+      ENTRY(0xffffff00, u8, pre, "tempsense_option", tempsense_option, 0, fb);
-+      ENTRY(0x00000700, u8, pre, "freqoffset_corr", freqoffset_corr, 0, fb);
-+      ENTRY(0x00000700, u8, pre, "iqcal_swp_dis", iqcal_swp_dis, 0, fb);
-+      ENTRY(0x00000700, u8, pre, "hw_iqcal_en", hw_iqcal_en, 0, fb);
-+      ENTRY(0x00000700, u8, pre, "elna2g", elna2g, 0, fb);
-+      ENTRY(0x00000700, u8, pre, "elna5g", elna5g, 0, fb);
-+      ENTRY(0xffffff00, u8, pre, "phycal_tempdelta", phycal_tempdelta, 0, fb);
-+      ENTRY(0xffffff00, u8, pre, "temps_period", temps_period, 0, fb);
-+      ENTRY(0xffffff00, u8, pre, "temps_hysteresis", temps_hysteresis, 0, fb);
-+      ENTRY(0xffffff00, u8, pre, "measpower1", measpower1, 0, fb);
-+      ENTRY(0xffffff00, u8, pre, "measpower2", measpower2, 0, fb);
-+
-+      ENTRY(0x000001f0, u16, pre, "cck2gpo", cck2gpo, 0, fb);
-+      ENTRY(0x000001f0, u32, pre, "ofdm2gpo", ofdm2gpo, 0, fb);
-+      ENTRY(0x000001f0, u32, pre, "ofdm5gpo", ofdm5gpo, 0, fb);
-+      ENTRY(0x000001f0, u32, pre, "ofdm5glpo", ofdm5glpo, 0, fb);
-+      ENTRY(0x000001f0, u32, pre, "ofdm5ghpo", ofdm5ghpo, 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "mcs2gpo0", mcs2gpo[0], 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "mcs2gpo1", mcs2gpo[1], 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "mcs2gpo2", mcs2gpo[2], 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "mcs2gpo3", mcs2gpo[3], 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "mcs2gpo4", mcs2gpo[4], 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "mcs2gpo5", mcs2gpo[5], 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "mcs2gpo6", mcs2gpo[6], 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "mcs2gpo7", mcs2gpo[7], 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "mcs5gpo0", mcs5gpo[0], 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "mcs5gpo1", mcs5gpo[1], 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "mcs5gpo2", mcs5gpo[2], 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "mcs5gpo3", mcs5gpo[3], 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "mcs5gpo4", mcs5gpo[4], 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "mcs5gpo5", mcs5gpo[5], 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "mcs5gpo6", mcs5gpo[6], 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "mcs5gpo7", mcs5gpo[7], 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "mcs5glpo0", mcs5glpo[0], 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "mcs5glpo1", mcs5glpo[1], 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "mcs5glpo2", mcs5glpo[2], 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "mcs5glpo3", mcs5glpo[3], 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "mcs5glpo4", mcs5glpo[4], 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "mcs5glpo5", mcs5glpo[5], 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "mcs5glpo6", mcs5glpo[6], 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "mcs5glpo7", mcs5glpo[7], 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "mcs5ghpo0", mcs5ghpo[0], 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "mcs5ghpo1", mcs5ghpo[1], 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "mcs5ghpo2", mcs5ghpo[2], 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "mcs5ghpo3", mcs5ghpo[3], 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "mcs5ghpo4", mcs5ghpo[4], 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "mcs5ghpo5", mcs5ghpo[5], 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "mcs5ghpo6", mcs5ghpo[6], 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "mcs5ghpo7", mcs5ghpo[7], 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "cddpo", cddpo, 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "stbcpo", stbcpo, 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "bw40po", bw40po, 0, fb);
-+      ENTRY(0x000001f0, u16, pre, "bwduppo", bwduppo, 0, fb);
-+
-+      ENTRY(0xfffffe00, u16, pre, "cckbw202gpo", cckbw202gpo, 0, fb);
-+      ENTRY(0xfffffe00, u16, pre, "cckbw20ul2gpo", cckbw20ul2gpo, 0, fb);
-+      ENTRY(0x00000600, u32, pre, "legofdmbw202gpo", legofdmbw202gpo, 0, fb);
-+      ENTRY(0x00000600, u32, pre, "legofdmbw20ul2gpo", legofdmbw20ul2gpo, 0, fb);
-+      ENTRY(0x00000600, u32, pre, "legofdmbw205glpo", legofdmbw205glpo, 0, fb);
-+      ENTRY(0x00000600, u32, pre, "legofdmbw20ul5glpo", legofdmbw20ul5glpo, 0, fb);
-+      ENTRY(0x00000600, u32, pre, "legofdmbw205gmpo", legofdmbw205gmpo, 0, fb);
-+      ENTRY(0x00000600, u32, pre, "legofdmbw20ul5gmpo", legofdmbw20ul5gmpo, 0, fb);
-+      ENTRY(0x00000600, u32, pre, "legofdmbw205ghpo", legofdmbw205ghpo, 0, fb);
-+      ENTRY(0x00000600, u32, pre, "legofdmbw20ul5ghpo", legofdmbw20ul5ghpo, 0, fb);
-+      ENTRY(0xfffffe00, u32, pre, "mcsbw202gpo", mcsbw202gpo, 0, fb);
-+      ENTRY(0x00000600, u32, pre, "mcsbw20ul2gpo", mcsbw20ul2gpo, 0, fb);
-+      ENTRY(0xfffffe00, u32, pre, "mcsbw402gpo", mcsbw402gpo, 0, fb);
-+      ENTRY(0xfffffe00, u32, pre, "mcsbw205glpo", mcsbw205glpo, 0, fb);
-+      ENTRY(0x00000600, u32, pre, "mcsbw20ul5glpo", mcsbw20ul5glpo, 0, fb);
-+      ENTRY(0xfffffe00, u32, pre, "mcsbw405glpo", mcsbw405glpo, 0, fb);
-+      ENTRY(0xfffffe00, u32, pre, "mcsbw205gmpo", mcsbw205gmpo, 0, fb);
-+      ENTRY(0x00000600, u32, pre, "mcsbw20ul5gmpo", mcsbw20ul5gmpo, 0, fb);
-+      ENTRY(0xfffffe00, u32, pre, "mcsbw405gmpo", mcsbw405gmpo, 0, fb);
-+      ENTRY(0xfffffe00, u32, pre, "mcsbw205ghpo", mcsbw205ghpo, 0, fb);
-+      ENTRY(0x00000600, u32, pre, "mcsbw20ul5ghpo", mcsbw20ul5ghpo, 0, fb);
-+      ENTRY(0xfffffe00, u32, pre, "mcsbw405ghpo", mcsbw405ghpo, 0, fb);
-+      ENTRY(0x00000600, u16, pre, "mcs32po", mcs32po, 0, fb);
-+      ENTRY(0x00000600, u16, pre, "legofdm40duppo", legofdm40duppo, 0, fb);
-+      ENTRY(0x00000700, u8, pre, "pcieingress_war", pcieingress_war, 0, fb);
-+
-+      /* TODO: rev 11 support */
-+      ENTRY(0x00000700, u8, pre, "rxgainerr2ga0", rxgainerr2ga[0], 0, fb);
-+      ENTRY(0x00000700, u8, pre, "rxgainerr2ga1", rxgainerr2ga[1], 0, fb);
-+      ENTRY(0x00000700, u8, pre, "rxgainerr2ga2", rxgainerr2ga[2], 0, fb);
-+      ENTRY(0x00000700, u8, pre, "rxgainerr5gla0", rxgainerr5gla[0], 0, fb);
-+      ENTRY(0x00000700, u8, pre, "rxgainerr5gla1", rxgainerr5gla[1], 0, fb);
-+      ENTRY(0x00000700, u8, pre, "rxgainerr5gla2", rxgainerr5gla[2], 0, fb);
-+      ENTRY(0x00000700, u8, pre, "rxgainerr5gma0", rxgainerr5gma[0], 0, fb);
-+      ENTRY(0x00000700, u8, pre, "rxgainerr5gma1", rxgainerr5gma[1], 0, fb);
-+      ENTRY(0x00000700, u8, pre, "rxgainerr5gma2", rxgainerr5gma[2], 0, fb);
-+      ENTRY(0x00000700, u8, pre, "rxgainerr5gha0", rxgainerr5gha[0], 0, fb);
-+      ENTRY(0x00000700, u8, pre, "rxgainerr5gha1", rxgainerr5gha[1], 0, fb);
-+      ENTRY(0x00000700, u8, pre, "rxgainerr5gha2", rxgainerr5gha[2], 0, fb);
-+      ENTRY(0x00000700, u8, pre, "rxgainerr5gua0", rxgainerr5gua[0], 0, fb);
-+      ENTRY(0x00000700, u8, pre, "rxgainerr5gua1", rxgainerr5gua[1], 0, fb);
-+      ENTRY(0x00000700, u8, pre, "rxgainerr5gua2", rxgainerr5gua[2], 0, fb);
-+
-+      ENTRY(0xfffffe00, u8, pre, "sar2g", sar2g, 0, fb);
-+      ENTRY(0xfffffe00, u8, pre, "sar5g", sar5g, 0, fb);
-+
-+      /* TODO: rev 11 support */
-+      ENTRY(0x00000700, u8, pre, "noiselvl2ga0", noiselvl2ga[0], 0, fb);
-+      ENTRY(0x00000700, u8, pre, "noiselvl2ga1", noiselvl2ga[1], 0, fb);
-+      ENTRY(0x00000700, u8, pre, "noiselvl2ga2", noiselvl2ga[2], 0, fb);
-+      ENTRY(0x00000700, u8, pre, "noiselvl5gla0", noiselvl5gla[0], 0, fb);
-+      ENTRY(0x00000700, u8, pre, "noiselvl5gla1", noiselvl5gla[1], 0, fb);
-+      ENTRY(0x00000700, u8, pre, "noiselvl5gla2", noiselvl5gla[2], 0, fb);
-+      ENTRY(0x00000700, u8, pre, "noiselvl5gma0", noiselvl5gma[0], 0, fb);
-+      ENTRY(0x00000700, u8, pre, "noiselvl5gma1", noiselvl5gma[1], 0, fb);
-+      ENTRY(0x00000700, u8, pre, "noiselvl5gma2", noiselvl5gma[2], 0, fb);
-+      ENTRY(0x00000700, u8, pre, "noiselvl5gha0", noiselvl5gha[0], 0, fb);
-+      ENTRY(0x00000700, u8, pre, "noiselvl5gha1", noiselvl5gha[1], 0, fb);
-+      ENTRY(0x00000700, u8, pre, "noiselvl5gha2", noiselvl5gha[2], 0, fb);
-+      ENTRY(0x00000700, u8, pre, "noiselvl5gua0", noiselvl5gua[0], 0, fb);
-+      ENTRY(0x00000700, u8, pre, "noiselvl5gua1", noiselvl5gua[1], 0, fb);
-+      ENTRY(0x00000700, u8, pre, "noiselvl5gua2", noiselvl5gua[2], 0, fb);
- }
- #undef ENTRY /* It's specififc, uses local variable, don't use it (again). */
- 
-@@ -211,90 +413,12 @@ static void bcm47xx_fill_sprom_r1234589(
-                                       const char *prefix, bool fallback)
- {
-       nvram_read_u16(prefix, NULL, "devid", &sprom->dev_id, 0, fallback);
--      nvram_read_u8(prefix, NULL, "ledbh0", &sprom->gpio0, 0xff, fallback);
--      nvram_read_u8(prefix, NULL, "ledbh1", &sprom->gpio1, 0xff, fallback);
--      nvram_read_u8(prefix, NULL, "ledbh2", &sprom->gpio2, 0xff, fallback);
--      nvram_read_u8(prefix, NULL, "ledbh3", &sprom->gpio3, 0xff, fallback);
--      nvram_read_u8(prefix, NULL, "aa2g", &sprom->ant_available_bg, 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "aa5g", &sprom->ant_available_a, 0,
--                    fallback);
--      nvram_read_s8(prefix, NULL, "ag0", &sprom->antenna_gain.a0, 0,
--                    fallback);
--      nvram_read_s8(prefix, NULL, "ag1", &sprom->antenna_gain.a1, 0,
--                    fallback);
-       nvram_read_alpha2(prefix, "ccode", sprom->alpha2, fallback);
- }
- 
--static void bcm47xx_fill_sprom_r12389(struct ssb_sprom *sprom,
--                                    const char *prefix, bool fallback)
--{
--      nvram_read_u16(prefix, NULL, "pa0b0", &sprom->pa0b0, 0, fallback);
--      nvram_read_u16(prefix, NULL, "pa0b1", &sprom->pa0b1, 0, fallback);
--      nvram_read_u16(prefix, NULL, "pa0b2", &sprom->pa0b2, 0, fallback);
--      nvram_read_u8(prefix, NULL, "pa0itssit", &sprom->itssi_bg, 0, fallback);
--      nvram_read_u8(prefix, NULL, "pa0maxpwr", &sprom->maxpwr_bg, 0,
--                    fallback);
--      nvram_read_u16(prefix, NULL, "pa1b0", &sprom->pa1b0, 0, fallback);
--      nvram_read_u16(prefix, NULL, "pa1b1", &sprom->pa1b1, 0, fallback);
--      nvram_read_u16(prefix, NULL, "pa1b2", &sprom->pa1b2, 0, fallback);
--      nvram_read_u8(prefix, NULL, "pa1itssit", &sprom->itssi_a, 0, fallback);
--      nvram_read_u8(prefix, NULL, "pa1maxpwr", &sprom->maxpwr_a, 0, fallback);
--}
--
--static void bcm47xx_fill_sprom_r1(struct ssb_sprom *sprom, const char *prefix,
--                                bool fallback)
--{
--      nvram_read_u16(prefix, NULL, "boardflags", &sprom->boardflags_lo, 0,
--                     fallback);
--      nvram_read_u8(prefix, NULL, "cc", &sprom->country_code, 0, fallback);
--}
--
--static void bcm47xx_fill_sprom_r2389(struct ssb_sprom *sprom,
--                                   const char *prefix, bool fallback)
--{
--      nvram_read_u8(prefix, NULL, "opo", &sprom->opo, 0, fallback);
--      nvram_read_u16(prefix, NULL, "pa1lob0", &sprom->pa1lob0, 0, fallback);
--      nvram_read_u16(prefix, NULL, "pa1lob1", &sprom->pa1lob1, 0, fallback);
--      nvram_read_u16(prefix, NULL, "pa1lob2", &sprom->pa1lob2, 0, fallback);
--      nvram_read_u16(prefix, NULL, "pa1hib0", &sprom->pa1hib0, 0, fallback);
--      nvram_read_u16(prefix, NULL, "pa1hib1", &sprom->pa1hib1, 0, fallback);
--      nvram_read_u16(prefix, NULL, "pa1hib2", &sprom->pa1hib2, 0, fallback);
--      nvram_read_u8(prefix, NULL, "pa1lomaxpwr", &sprom->maxpwr_al, 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "pa1himaxpwr", &sprom->maxpwr_ah, 0,
--                    fallback);
--}
--
--static void bcm47xx_fill_sprom_r389(struct ssb_sprom *sprom, const char *prefix,
--                                  bool fallback)
--{
--      nvram_read_u8(prefix, NULL, "bxa2g", &sprom->bxa2g, 0, fallback);
--      nvram_read_u8(prefix, NULL, "rssisav2g", &sprom->rssisav2g, 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "rssismc2g", &sprom->rssismc2g, 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "rssismf2g", &sprom->rssismf2g, 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "bxa5g", &sprom->bxa5g, 0, fallback);
--      nvram_read_u8(prefix, NULL, "rssisav5g", &sprom->rssisav5g, 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "rssismc5g", &sprom->rssismc5g, 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "rssismf5g", &sprom->rssismf5g, 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "tri2g", &sprom->tri2g, 0, fallback);
--      nvram_read_u8(prefix, NULL, "tri5g", &sprom->tri5g, 0, fallback);
--      nvram_read_u8(prefix, NULL, "tri5gl", &sprom->tri5gl, 0, fallback);
--      nvram_read_u8(prefix, NULL, "tri5gh", &sprom->tri5gh, 0, fallback);
--      nvram_read_s8(prefix, NULL, "rxpo2g", &sprom->rxpo2g, 0, fallback);
--      nvram_read_s8(prefix, NULL, "rxpo5g", &sprom->rxpo5g, 0, fallback);
--}
--
- static void bcm47xx_fill_sprom_r3(struct ssb_sprom *sprom, const char *prefix,
-                                 bool fallback)
- {
--      nvram_read_u8(prefix, NULL, "regrev", &sprom->regrev, 0, fallback);
-       nvram_read_leddc(prefix, "leddc", &sprom->leddc_on_time,
-                        &sprom->leddc_off_time, fallback);
- }
-@@ -302,309 +426,10 @@ static void bcm47xx_fill_sprom_r3(struct
- static void bcm47xx_fill_sprom_r4589(struct ssb_sprom *sprom,
-                                    const char *prefix, bool fallback)
- {
--      nvram_read_u8(prefix, NULL, "regrev", &sprom->regrev, 0, fallback);
--      nvram_read_s8(prefix, NULL, "ag2", &sprom->antenna_gain.a2, 0,
--                    fallback);
--      nvram_read_s8(prefix, NULL, "ag3", &sprom->antenna_gain.a3, 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "txchain", &sprom->txchain, 0xf, fallback);
--      nvram_read_u8(prefix, NULL, "rxchain", &sprom->rxchain, 0xf, fallback);
--      nvram_read_u8(prefix, NULL, "antswitch", &sprom->antswitch, 0xff,
--                    fallback);
-       nvram_read_leddc(prefix, "leddc", &sprom->leddc_on_time,
-                        &sprom->leddc_off_time, fallback);
- }
- 
--static void bcm47xx_fill_sprom_r458(struct ssb_sprom *sprom, const char *prefix,
--                                  bool fallback)
--{
--      nvram_read_u16(prefix, NULL, "cck2gpo", &sprom->cck2gpo, 0, fallback);
--      nvram_read_u32(prefix, NULL, "ofdm2gpo", &sprom->ofdm2gpo, 0, fallback);
--      nvram_read_u32(prefix, NULL, "ofdm5gpo", &sprom->ofdm5gpo, 0, fallback);
--      nvram_read_u32(prefix, NULL, "ofdm5glpo", &sprom->ofdm5glpo, 0,
--                     fallback);
--      nvram_read_u32(prefix, NULL, "ofdm5ghpo", &sprom->ofdm5ghpo, 0,
--                     fallback);
--      nvram_read_u16(prefix, NULL, "cddpo", &sprom->cddpo, 0, fallback);
--      nvram_read_u16(prefix, NULL, "stbcpo", &sprom->stbcpo, 0, fallback);
--      nvram_read_u16(prefix, NULL, "bw40po", &sprom->bw40po, 0, fallback);
--      nvram_read_u16(prefix, NULL, "bwduppo", &sprom->bwduppo, 0, fallback);
--      nvram_read_u16(prefix, NULL, "mcs2gpo0", &sprom->mcs2gpo[0], 0,
--                     fallback);
--      nvram_read_u16(prefix, NULL, "mcs2gpo1", &sprom->mcs2gpo[1], 0,
--                     fallback);
--      nvram_read_u16(prefix, NULL, "mcs2gpo2", &sprom->mcs2gpo[2], 0,
--                     fallback);
--      nvram_read_u16(prefix, NULL, "mcs2gpo3", &sprom->mcs2gpo[3], 0,
--                     fallback);
--      nvram_read_u16(prefix, NULL, "mcs2gpo4", &sprom->mcs2gpo[4], 0,
--                     fallback);
--      nvram_read_u16(prefix, NULL, "mcs2gpo5", &sprom->mcs2gpo[5], 0,
--                     fallback);
--      nvram_read_u16(prefix, NULL, "mcs2gpo6", &sprom->mcs2gpo[6], 0,
--                     fallback);
--      nvram_read_u16(prefix, NULL, "mcs2gpo7", &sprom->mcs2gpo[7], 0,
--                     fallback);
--      nvram_read_u16(prefix, NULL, "mcs5gpo0", &sprom->mcs5gpo[0], 0,
--                     fallback);
--      nvram_read_u16(prefix, NULL, "mcs5gpo1", &sprom->mcs5gpo[1], 0,
--                     fallback);
--      nvram_read_u16(prefix, NULL, "mcs5gpo2", &sprom->mcs5gpo[2], 0,
--                     fallback);
--      nvram_read_u16(prefix, NULL, "mcs5gpo3", &sprom->mcs5gpo[3], 0,
--                     fallback);
--      nvram_read_u16(prefix, NULL, "mcs5gpo4", &sprom->mcs5gpo[4], 0,
--                     fallback);
--      nvram_read_u16(prefix, NULL, "mcs5gpo5", &sprom->mcs5gpo[5], 0,
--                     fallback);
--      nvram_read_u16(prefix, NULL, "mcs5gpo6", &sprom->mcs5gpo[6], 0,
--                     fallback);
--      nvram_read_u16(prefix, NULL, "mcs5gpo7", &sprom->mcs5gpo[7], 0,
--                     fallback);
--      nvram_read_u16(prefix, NULL, "mcs5glpo0", &sprom->mcs5glpo[0], 0,
--                     fallback);
--      nvram_read_u16(prefix, NULL, "mcs5glpo1", &sprom->mcs5glpo[1], 0,
--                     fallback);
--      nvram_read_u16(prefix, NULL, "mcs5glpo2", &sprom->mcs5glpo[2], 0,
--                     fallback);
--      nvram_read_u16(prefix, NULL, "mcs5glpo3", &sprom->mcs5glpo[3], 0,
--                     fallback);
--      nvram_read_u16(prefix, NULL, "mcs5glpo4", &sprom->mcs5glpo[4], 0,
--                     fallback);
--      nvram_read_u16(prefix, NULL, "mcs5glpo5", &sprom->mcs5glpo[5], 0,
--                     fallback);
--      nvram_read_u16(prefix, NULL, "mcs5glpo6", &sprom->mcs5glpo[6], 0,
--                     fallback);
--      nvram_read_u16(prefix, NULL, "mcs5glpo7", &sprom->mcs5glpo[7], 0,
--                     fallback);
--      nvram_read_u16(prefix, NULL, "mcs5ghpo0", &sprom->mcs5ghpo[0], 0,
--                     fallback);
--      nvram_read_u16(prefix, NULL, "mcs5ghpo1", &sprom->mcs5ghpo[1], 0,
--                     fallback);
--      nvram_read_u16(prefix, NULL, "mcs5ghpo2", &sprom->mcs5ghpo[2], 0,
--                     fallback);
--      nvram_read_u16(prefix, NULL, "mcs5ghpo3", &sprom->mcs5ghpo[3], 0,
--                     fallback);
--      nvram_read_u16(prefix, NULL, "mcs5ghpo4", &sprom->mcs5ghpo[4], 0,
--                     fallback);
--      nvram_read_u16(prefix, NULL, "mcs5ghpo5", &sprom->mcs5ghpo[5], 0,
--                     fallback);
--      nvram_read_u16(prefix, NULL, "mcs5ghpo6", &sprom->mcs5ghpo[6], 0,
--                     fallback);
--      nvram_read_u16(prefix, NULL, "mcs5ghpo7", &sprom->mcs5ghpo[7], 0,
--                     fallback);
--}
--
--static void bcm47xx_fill_sprom_r45(struct ssb_sprom *sprom, const char *prefix,
--                                 bool fallback)
--{
--      nvram_read_u8(prefix, NULL, "txpid2ga0", &sprom->txpid2g[0], 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "txpid2ga1", &sprom->txpid2g[1], 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "txpid2ga2", &sprom->txpid2g[2], 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "txpid2ga3", &sprom->txpid2g[3], 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "txpid5ga0", &sprom->txpid5g[0], 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "txpid5ga1", &sprom->txpid5g[1], 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "txpid5ga2", &sprom->txpid5g[2], 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "txpid5ga3", &sprom->txpid5g[3], 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "txpid5gla0", &sprom->txpid5gl[0], 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "txpid5gla1", &sprom->txpid5gl[1], 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "txpid5gla2", &sprom->txpid5gl[2], 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "txpid5gla3", &sprom->txpid5gl[3], 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "txpid5gha0", &sprom->txpid5gh[0], 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "txpid5gha1", &sprom->txpid5gh[1], 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "txpid5gha2", &sprom->txpid5gh[2], 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "txpid5gha3", &sprom->txpid5gh[3], 0,
--                    fallback);
--}
--
--static void bcm47xx_fill_sprom_r89(struct ssb_sprom *sprom, const char *prefix,
--                                 bool fallback)
--{
--      nvram_read_u8(prefix, NULL, "tssipos2g", &sprom->fem.ghz2.tssipos, 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "extpagain2g",
--                    &sprom->fem.ghz2.extpa_gain, 0, fallback);
--      nvram_read_u8(prefix, NULL, "pdetrange2g",
--                    &sprom->fem.ghz2.pdet_range, 0, fallback);
--      nvram_read_u8(prefix, NULL, "triso2g", &sprom->fem.ghz2.tr_iso, 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "antswctl2g", &sprom->fem.ghz2.antswlut, 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "tssipos5g", &sprom->fem.ghz5.tssipos, 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "extpagain5g",
--                    &sprom->fem.ghz5.extpa_gain, 0, fallback);
--      nvram_read_u8(prefix, NULL, "pdetrange5g",
--                    &sprom->fem.ghz5.pdet_range, 0, fallback);
--      nvram_read_u8(prefix, NULL, "triso5g", &sprom->fem.ghz5.tr_iso, 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "antswctl5g", &sprom->fem.ghz5.antswlut, 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "tempthresh", &sprom->tempthresh, 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "tempoffset", &sprom->tempoffset, 0,
--                    fallback);
--      nvram_read_u16(prefix, NULL, "rawtempsense", &sprom->rawtempsense, 0,
--                     fallback);
--      nvram_read_u8(prefix, NULL, "measpower", &sprom->measpower, 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "tempsense_slope",
--                    &sprom->tempsense_slope, 0, fallback);
--      nvram_read_u8(prefix, NULL, "tempcorrx", &sprom->tempcorrx, 0,
--                     fallback);
--      nvram_read_u8(prefix, NULL, "tempsense_option",
--                    &sprom->tempsense_option, 0, fallback);
--      nvram_read_u8(prefix, NULL, "freqoffset_corr",
--                    &sprom->freqoffset_corr, 0, fallback);
--      nvram_read_u8(prefix, NULL, "iqcal_swp_dis", &sprom->iqcal_swp_dis, 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "hw_iqcal_en", &sprom->hw_iqcal_en, 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "elna2g", &sprom->elna2g, 0, fallback);
--      nvram_read_u8(prefix, NULL, "elna5g", &sprom->elna5g, 0, fallback);
--      nvram_read_u8(prefix, NULL, "phycal_tempdelta",
--                    &sprom->phycal_tempdelta, 0, fallback);
--      nvram_read_u8(prefix, NULL, "temps_period", &sprom->temps_period, 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "temps_hysteresis",
--                    &sprom->temps_hysteresis, 0, fallback);
--      nvram_read_u8(prefix, NULL, "measpower1", &sprom->measpower1, 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "measpower2", &sprom->measpower2, 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "rxgainerr2ga0",
--                    &sprom->rxgainerr2ga[0], 0, fallback);
--      nvram_read_u8(prefix, NULL, "rxgainerr2ga1",
--                    &sprom->rxgainerr2ga[1], 0, fallback);
--      nvram_read_u8(prefix, NULL, "rxgainerr2ga2",
--                    &sprom->rxgainerr2ga[2], 0, fallback);
--      nvram_read_u8(prefix, NULL, "rxgainerr5gla0",
--                    &sprom->rxgainerr5gla[0], 0, fallback);
--      nvram_read_u8(prefix, NULL, "rxgainerr5gla1",
--                    &sprom->rxgainerr5gla[1], 0, fallback);
--      nvram_read_u8(prefix, NULL, "rxgainerr5gla2",
--                    &sprom->rxgainerr5gla[2], 0, fallback);
--      nvram_read_u8(prefix, NULL, "rxgainerr5gma0",
--                    &sprom->rxgainerr5gma[0], 0, fallback);
--      nvram_read_u8(prefix, NULL, "rxgainerr5gma1",
--                    &sprom->rxgainerr5gma[1], 0, fallback);
--      nvram_read_u8(prefix, NULL, "rxgainerr5gma2",
--                    &sprom->rxgainerr5gma[2], 0, fallback);
--      nvram_read_u8(prefix, NULL, "rxgainerr5gha0",
--                    &sprom->rxgainerr5gha[0], 0, fallback);
--      nvram_read_u8(prefix, NULL, "rxgainerr5gha1",
--                    &sprom->rxgainerr5gha[1], 0, fallback);
--      nvram_read_u8(prefix, NULL, "rxgainerr5gha2",
--                    &sprom->rxgainerr5gha[2], 0, fallback);
--      nvram_read_u8(prefix, NULL, "rxgainerr5gua0",
--                    &sprom->rxgainerr5gua[0], 0, fallback);
--      nvram_read_u8(prefix, NULL, "rxgainerr5gua1",
--                    &sprom->rxgainerr5gua[1], 0, fallback);
--      nvram_read_u8(prefix, NULL, "rxgainerr5gua2",
--                    &sprom->rxgainerr5gua[2], 0, fallback);
--      nvram_read_u8(prefix, NULL, "noiselvl2ga0", &sprom->noiselvl2ga[0], 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "noiselvl2ga1", &sprom->noiselvl2ga[1], 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "noiselvl2ga2", &sprom->noiselvl2ga[2], 0,
--                    fallback);
--      nvram_read_u8(prefix, NULL, "noiselvl5gla0",
--                    &sprom->noiselvl5gla[0], 0, fallback);
--      nvram_read_u8(prefix, NULL, "noiselvl5gla1",
--                    &sprom->noiselvl5gla[1], 0, fallback);
--      nvram_read_u8(prefix, NULL, "noiselvl5gla2",
--                    &sprom->noiselvl5gla[2], 0, fallback);
--      nvram_read_u8(prefix, NULL, "noiselvl5gma0",
--                    &sprom->noiselvl5gma[0], 0, fallback);
--      nvram_read_u8(prefix, NULL, "noiselvl5gma1",
--                    &sprom->noiselvl5gma[1], 0, fallback);
--      nvram_read_u8(prefix, NULL, "noiselvl5gma2",
--                    &sprom->noiselvl5gma[2], 0, fallback);
--      nvram_read_u8(prefix, NULL, "noiselvl5gha0",
--                    &sprom->noiselvl5gha[0], 0, fallback);
--      nvram_read_u8(prefix, NULL, "noiselvl5gha1",
--                    &sprom->noiselvl5gha[1], 0, fallback);
--      nvram_read_u8(prefix, NULL, "noiselvl5gha2",
--                    &sprom->noiselvl5gha[2], 0, fallback);
--      nvram_read_u8(prefix, NULL, "noiselvl5gua0",
--                    &sprom->noiselvl5gua[0], 0, fallback);
--      nvram_read_u8(prefix, NULL, "noiselvl5gua1",
--                    &sprom->noiselvl5gua[1], 0, fallback);
--      nvram_read_u8(prefix, NULL, "noiselvl5gua2",
--                    &sprom->noiselvl5gua[2], 0, fallback);
--      nvram_read_u8(prefix, NULL, "pcieingress_war",
--                    &sprom->pcieingress_war, 0, fallback);
--}
--
--static void bcm47xx_fill_sprom_r9(struct ssb_sprom *sprom, const char *prefix,
--                                bool fallback)
--{
--      nvram_read_u16(prefix, NULL, "cckbw202gpo", &sprom->cckbw202gpo, 0,
--                     fallback);
--      nvram_read_u16(prefix, NULL, "cckbw20ul2gpo", &sprom->cckbw20ul2gpo, 0,
--                     fallback);
--      nvram_read_u32(prefix, NULL, "legofdmbw202gpo",
--                     &sprom->legofdmbw202gpo, 0, fallback);
--      nvram_read_u32(prefix, NULL, "legofdmbw20ul2gpo",
--                     &sprom->legofdmbw20ul2gpo, 0, fallback);
--      nvram_read_u32(prefix, NULL, "legofdmbw205glpo",
--                     &sprom->legofdmbw205glpo, 0, fallback);
--      nvram_read_u32(prefix, NULL, "legofdmbw20ul5glpo",
--                     &sprom->legofdmbw20ul5glpo, 0, fallback);
--      nvram_read_u32(prefix, NULL, "legofdmbw205gmpo",
--                     &sprom->legofdmbw205gmpo, 0, fallback);
--      nvram_read_u32(prefix, NULL, "legofdmbw20ul5gmpo",
--                     &sprom->legofdmbw20ul5gmpo, 0, fallback);
--      nvram_read_u32(prefix, NULL, "legofdmbw205ghpo",
--                     &sprom->legofdmbw205ghpo, 0, fallback);
--      nvram_read_u32(prefix, NULL, "legofdmbw20ul5ghpo",
--                     &sprom->legofdmbw20ul5ghpo, 0, fallback);
--      nvram_read_u32(prefix, NULL, "mcsbw202gpo", &sprom->mcsbw202gpo, 0,
--                     fallback);
--      nvram_read_u32(prefix, NULL, "mcsbw20ul2gpo", &sprom->mcsbw20ul2gpo, 0,
--                     fallback);
--      nvram_read_u32(prefix, NULL, "mcsbw402gpo", &sprom->mcsbw402gpo, 0,
--                     fallback);
--      nvram_read_u32(prefix, NULL, "mcsbw205glpo", &sprom->mcsbw205glpo, 0,
--                     fallback);
--      nvram_read_u32(prefix, NULL, "mcsbw20ul5glpo",
--                     &sprom->mcsbw20ul5glpo, 0, fallback);
--      nvram_read_u32(prefix, NULL, "mcsbw405glpo", &sprom->mcsbw405glpo, 0,
--                     fallback);
--      nvram_read_u32(prefix, NULL, "mcsbw205gmpo", &sprom->mcsbw205gmpo, 0,
--                     fallback);
--      nvram_read_u32(prefix, NULL, "mcsbw20ul5gmpo",
--                     &sprom->mcsbw20ul5gmpo, 0, fallback);
--      nvram_read_u32(prefix, NULL, "mcsbw405gmpo", &sprom->mcsbw405gmpo, 0,
--                     fallback);
--      nvram_read_u32(prefix, NULL, "mcsbw205ghpo", &sprom->mcsbw205ghpo, 0,
--                     fallback);
--      nvram_read_u32(prefix, NULL, "mcsbw20ul5ghpo",
--                     &sprom->mcsbw20ul5ghpo, 0, fallback);
--      nvram_read_u32(prefix, NULL, "mcsbw405ghpo", &sprom->mcsbw405ghpo, 0,
--                     fallback);
--      nvram_read_u16(prefix, NULL, "mcs32po", &sprom->mcs32po, 0, fallback);
--      nvram_read_u16(prefix, NULL, "legofdm40duppo",
--                     &sprom->legofdm40duppo, 0, fallback);
--      nvram_read_u8(prefix, NULL, "sar2g", &sprom->sar2g, 0, fallback);
--      nvram_read_u8(prefix, NULL, "sar5g", &sprom->sar5g, 0, fallback);
--}
--
- static void bcm47xx_fill_sprom_path_r4589(struct ssb_sprom *sprom,
-                                         const char *prefix, bool fallback)
- {
-@@ -741,7 +566,6 @@ static void bcm47xx_fill_sprom_ethernet(
- static void bcm47xx_fill_board_data(struct ssb_sprom *sprom, const char *prefix,
-                                   bool fallback)
- {
--      nvram_read_u16(prefix, NULL, "boardtype", &sprom->board_type, 0, true);
-       nvram_read_u32_2(prefix, "boardflags", &sprom->boardflags_lo,
-                        &sprom->boardflags_hi, fallback);
-       nvram_read_u32_2(prefix, "boardflags2", &sprom->boardflags2_lo,
-@@ -759,48 +583,29 @@ void bcm47xx_fill_sprom(struct ssb_sprom
-       switch (sprom->revision) {
-       case 1:
-               bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
--              bcm47xx_fill_sprom_r12389(sprom, prefix, fallback);
--              bcm47xx_fill_sprom_r1(sprom, prefix, fallback);
-               break;
-       case 2:
-               bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
--              bcm47xx_fill_sprom_r12389(sprom, prefix, fallback);
--              bcm47xx_fill_sprom_r2389(sprom, prefix, fallback);
-               break;
-       case 3:
-               bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
--              bcm47xx_fill_sprom_r12389(sprom, prefix, fallback);
--              bcm47xx_fill_sprom_r2389(sprom, prefix, fallback);
--              bcm47xx_fill_sprom_r389(sprom, prefix, fallback);
-               bcm47xx_fill_sprom_r3(sprom, prefix, fallback);
-               break;
-       case 4:
-       case 5:
-               bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
-               bcm47xx_fill_sprom_r4589(sprom, prefix, fallback);
--              bcm47xx_fill_sprom_r458(sprom, prefix, fallback);
--              bcm47xx_fill_sprom_r45(sprom, prefix, fallback);
-               bcm47xx_fill_sprom_path_r4589(sprom, prefix, fallback);
-               bcm47xx_fill_sprom_path_r45(sprom, prefix, fallback);
-               break;
-       case 8:
-               bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
--              bcm47xx_fill_sprom_r12389(sprom, prefix, fallback);
--              bcm47xx_fill_sprom_r2389(sprom, prefix, fallback);
--              bcm47xx_fill_sprom_r389(sprom, prefix, fallback);
-               bcm47xx_fill_sprom_r4589(sprom, prefix, fallback);
--              bcm47xx_fill_sprom_r458(sprom, prefix, fallback);
--              bcm47xx_fill_sprom_r89(sprom, prefix, fallback);
-               bcm47xx_fill_sprom_path_r4589(sprom, prefix, fallback);
-               break;
-       case 9:
-               bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
--              bcm47xx_fill_sprom_r12389(sprom, prefix, fallback);
--              bcm47xx_fill_sprom_r2389(sprom, prefix, fallback);
--              bcm47xx_fill_sprom_r389(sprom, prefix, fallback);
-               bcm47xx_fill_sprom_r4589(sprom, prefix, fallback);
--              bcm47xx_fill_sprom_r89(sprom, prefix, fallback);
--              bcm47xx_fill_sprom_r9(sprom, prefix, fallback);
-               bcm47xx_fill_sprom_path_r4589(sprom, prefix, fallback);
-               break;
-       default:
-@@ -808,8 +613,6 @@ void bcm47xx_fill_sprom(struct ssb_sprom
-                       sprom->revision);
-               sprom->revision = 1;
-               bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
--              bcm47xx_fill_sprom_r12389(sprom, prefix, fallback);
--              bcm47xx_fill_sprom_r1(sprom, prefix, fallback);
-       }
- 
-       bcm47xx_sprom_fill_auto(sprom, prefix, fallback);

diff --git a/target/linux/brcm47xx/patches-4.0/031-01-MIPS-BCM47XX-Make-sure-NVRAM-buffer-ends-with-0.patch b/target/linux/brcm47xx/patches-4.1/031-01-MIPS-BCM47XX-Make-sure-NVRAM-buffer-ends-with-0.patch
similarity index 100%
rename from target/linux/brcm47xx/patches-4.0/031-01-MIPS-BCM47XX-Make-sure-NVRAM-buffer-ends-with-0.patch
rename to target/linux/brcm47xx/patches-4.1/031-01-MIPS-BCM47XX-Make-sure-NVRAM-buffer-ends-with-0.patch

diff --git a/target/linux/brcm47xx/patches-4.0/031-02-MIPS-BCM47XX-Simplify-function-looking-for-NVRAM-ent.patch b/target/linux/brcm47xx/patches-4.1/031-02-MIPS-BCM47XX-Simplify-function-looking-for-NVRAM-ent.patch
similarity index 100%
rename from target/linux/brcm47xx/patches-4.0/031-02-MIPS-BCM47XX-Simplify-function-looking-for-NVRAM-ent.patch
rename to target/linux/brcm47xx/patches-4.1/031-02-MIPS-BCM47XX-Simplify-function-looking-for-NVRAM-ent.patch

diff --git a/target/linux/brcm47xx/patches-4.0/031-03-MIPS-BCM47xx-Extract-all-boardflags-to-new-u32-field.patch b/target/linux/brcm47xx/patches-4.1/031-03-MIPS-BCM47xx-Extract-all-boardflags-to-new-u32-field.patch
similarity index 100%
rename from target/linux/brcm47xx/patches-4.0/031-03-MIPS-BCM47xx-Extract-all-boardflags-to-new-u32-field.patch
rename to target/linux/brcm47xx/patches-4.1/031-03-MIPS-BCM47xx-Extract-all-boardflags-to-new-u32-field.patch

diff --git a/target/linux/brcm47xx/patches-4.0/031-04-MIPS-BCM47xx-Extract-info-about-et2-interface.patch b/target/linux/brcm47xx/patches-4.1/031-04-MIPS-BCM47xx-Extract-info-about-et2-interface.patch
similarity index 100%
rename from target/linux/brcm47xx/patches-4.0/031-04-MIPS-BCM47xx-Extract-info-about-et2-interface.patch
rename to target/linux/brcm47xx/patches-4.1/031-04-MIPS-BCM47xx-Extract-info-about-et2-interface.patch

diff --git a/target/linux/brcm47xx/patches-4.0/031-05-MIPS-BCM47xx-Read-board-info-for-all-bcma-buses.patch b/target/linux/brcm47xx/patches-4.1/031-05-MIPS-BCM47xx-Read-board-info-for-all-bcma-buses.patch
similarity index 100%
rename from target/linux/brcm47xx/patches-4.0/031-05-MIPS-BCM47xx-Read-board-info-for-all-bcma-buses.patch
rename to target/linux/brcm47xx/patches-4.1/031-05-MIPS-BCM47xx-Read-board-info-for-all-bcma-buses.patch

diff --git a/target/linux/brcm47xx/patches-4.0/031-06-MIPS-BCM77xx-Remove-legacy-__cpuinit-data-sections-t.patch b/target/linux/brcm47xx/patches-4.1/031-06-MIPS-BCM77xx-Remove-legacy-__cpuinit-data-sections-t.patch
similarity index 97%
rename from target/linux/brcm47xx/patches-4.0/031-06-MIPS-BCM77xx-Remove-legacy-__cpuinit-data-sections-t.patch
rename to target/linux/brcm47xx/patches-4.1/031-06-MIPS-BCM77xx-Remove-legacy-__cpuinit-data-sections-t.patch
index 38b95d2eca4bc6cc2b99f4acd186d462a1dcf477..e81f695a7916d1167caea95c62aad30a8968f5bb 100644 (file)
--- a/target/linux/brcm47xx/patches-4.0/031-06-MIPS-BCM77xx-Remove-legacy-__cpuinit-data-sections-t.patch
+++ b/target/linux/brcm47xx/patches-4.1/031-06-MIPS-BCM77xx-Remove-legacy-__cpuinit-data-sections-t.patch
@@ -49,7 +49,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
   * - add_temporary_entry() add a temporary TLB entry. We use TLB entries
 --- a/arch/mips/mm/tlb-r4k.c
 +++ b/arch/mips/mm/tlb-r4k.c
-@@ -411,7 +411,7 @@ int __init has_transparent_hugepage(void
+@@ -423,7 +423,7 @@ int __init has_transparent_hugepage(void
   * lifetime of the system
   */
  

diff --git a/target/linux/brcm47xx/patches-4.0/031-07-MIPS-BCM47XX-Support-Luxul-XWR-1750-board.patch b/target/linux/brcm47xx/patches-4.1/031-07-MIPS-BCM47XX-Support-Luxul-XWR-1750-board.patch
similarity index 100%
rename from target/linux/brcm47xx/patches-4.0/031-07-MIPS-BCM47XX-Support-Luxul-XWR-1750-board.patch
rename to target/linux/brcm47xx/patches-4.1/031-07-MIPS-BCM47XX-Support-Luxul-XWR-1750-board.patch

diff --git a/target/linux/brcm47xx/patches-4.0/031-08-mips-bcm47xx-allow-retrieval-of-complete-nvram-conte.patch b/target/linux/brcm47xx/patches-4.1/031-08-mips-bcm47xx-allow-retrieval-of-complete-nvram-conte.patch
similarity index 100%
rename from target/linux/brcm47xx/patches-4.0/031-08-mips-bcm47xx-allow-retrieval-of-complete-nvram-conte.patch
rename to target/linux/brcm47xx/patches-4.1/031-08-mips-bcm47xx-allow-retrieval-of-complete-nvram-conte.patch

diff --git a/target/linux/brcm47xx/patches-4.0/031-09-MIPS-BCM47xx-Add-helper-variable-for-storing-NVRAM-l.patch b/target/linux/brcm47xx/patches-4.1/031-09-MIPS-BCM47xx-Add-helper-variable-for-storing-NVRAM-l.patch
similarity index 100%
rename from target/linux/brcm47xx/patches-4.0/031-09-MIPS-BCM47xx-Add-helper-variable-for-storing-NVRAM-l.patch
rename to target/linux/brcm47xx/patches-4.1/031-09-MIPS-BCM47xx-Add-helper-variable-for-storing-NVRAM-l.patch

diff --git a/target/linux/brcm47xx/patches-4.0/031-10-MIPS-BCM47xx-Don-t-select-BCMA_HOST_PCI.patch b/target/linux/brcm47xx/patches-4.1/031-10-MIPS-BCM47xx-Don-t-select-BCMA_HOST_PCI.patch
similarity index 100%
rename from target/linux/brcm47xx/patches-4.0/031-10-MIPS-BCM47xx-Don-t-select-BCMA_HOST_PCI.patch
rename to target/linux/brcm47xx/patches-4.1/031-10-MIPS-BCM47xx-Don-t-select-BCMA_HOST_PCI.patch

diff --git a/target/linux/brcm47xx/patches-4.0/159-cpu_fixes.patch b/target/linux/brcm47xx/patches-4.1/159-cpu_fixes.patch
similarity index 97%
rename from target/linux/brcm47xx/patches-4.0/159-cpu_fixes.patch
rename to target/linux/brcm47xx/patches-4.1/159-cpu_fixes.patch
index 38c64318f1c34bc1d814a99dce77c7d10de1ddbf..a80c8f4a1fcfdc9e13e7df2905cecaeedd2e8355 100644 (file)
--- a/target/linux/brcm47xx/patches-4.0/159-cpu_fixes.patch
+++ b/target/linux/brcm47xx/patches-4.1/159-cpu_fixes.patch
@@ -308,7 +308,7 @@
        if (dc_lsize == 0)
                r4k_blast_dcache = (void *)cache_noop;
        else if (dc_lsize == 16)
-@@ -784,6 +796,8 @@ static void local_r4k_flush_cache_sigtra
+@@ -785,6 +797,8 @@ static void local_r4k_flush_cache_sigtra
        unsigned long addr = (unsigned long) arg;
  
        R4600_HIT_CACHEOP_WAR_IMPL;
@@ -317,7 +317,7 @@
        if (dc_lsize)
                protected_writeback_dcache_line(addr & ~(dc_lsize - 1));
        if (!cpu_icache_snoops_remote_store && scache_size)
-@@ -1580,6 +1594,17 @@ static void coherency_setup(void)
+@@ -1591,6 +1605,17 @@ static void coherency_setup(void)
         * silly idea of putting something else there ...
         */
        switch (current_cpu_type()) {
@@ -335,7 +335,7 @@
        case CPU_R4000PC:
        case CPU_R4000SC:
        case CPU_R4000MC:
-@@ -1626,6 +1651,15 @@ void r4k_cache_init(void)
+@@ -1637,6 +1662,15 @@ void r4k_cache_init(void)
        extern void build_copy_page(void);
        struct cpuinfo_mips *c = &current_cpu_data;
  
@@ -351,7 +351,7 @@
        probe_pcache();
        setup_scache();
  
-@@ -1695,7 +1729,15 @@ void r4k_cache_init(void)
+@@ -1706,7 +1740,15 @@ void r4k_cache_init(void)
         */
        local_r4k___flush_cache_all(NULL);
  
@@ -369,7 +369,7 @@
        /*
 --- a/arch/mips/mm/tlbex.c
 +++ b/arch/mips/mm/tlbex.c
-@@ -1269,6 +1269,9 @@ static void build_r4000_tlb_refill_handl
+@@ -1296,6 +1296,9 @@ static void build_r4000_tlb_refill_handl
                        /* No need for uasm_i_nop */
                }
  
@@ -379,7 +379,7 @@
  #ifdef CONFIG_64BIT
                build_get_pmde64(&p, &l, &r, K0, K1); /* get pmd in K1 */
  #else
-@@ -1831,6 +1834,9 @@ build_r4000_tlbchange_handler_head(u32 *
+@@ -1868,6 +1871,9 @@ build_r4000_tlbchange_handler_head(u32 *
  {
        struct work_registers wr = build_get_work_registers(p);
  

diff --git a/target/linux/brcm47xx/patches-4.0/160-kmap_coherent.patch b/target/linux/brcm47xx/patches-4.1/160-kmap_coherent.patch
similarity index 86%
rename from target/linux/brcm47xx/patches-4.0/160-kmap_coherent.patch
rename to target/linux/brcm47xx/patches-4.1/160-kmap_coherent.patch
index fde1a706e215357277ed79deeb6114875f4d64d4..a78bfe85ff259d9b89ace1a07cbf8e44ee62725e 100644 (file)
--- a/target/linux/brcm47xx/patches-4.0/160-kmap_coherent.patch
+++ b/target/linux/brcm47xx/patches-4.1/160-kmap_coherent.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/include/asm/cpu-features.h
 +++ b/arch/mips/include/asm/cpu-features.h
-@@ -154,6 +154,9 @@
+@@ -158,6 +158,9 @@
  #ifndef cpu_has_local_ebase
  #define cpu_has_local_ebase   1
  #endif
@@ -21,7 +21,7 @@
  #endif /* __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H */
 --- a/arch/mips/mm/c-r4k.c
 +++ b/arch/mips/mm/c-r4k.c
-@@ -591,7 +591,7 @@ static inline void local_r4k_flush_cache
+@@ -592,7 +592,7 @@ static inline void local_r4k_flush_cache
                 */
                map_coherent = (cpu_has_dc_aliases &&
                                page_mapped(page) && !Page_dcache_dirty(page));
@@ -30,7 +30,7 @@
                        vaddr = kmap_coherent(page, addr);
                else
                        vaddr = kmap_atomic(page);
-@@ -616,7 +616,7 @@ static inline void local_r4k_flush_cache
+@@ -617,7 +617,7 @@ static inline void local_r4k_flush_cache
        }
  
        if (vaddr) {
@@ -41,7 +41,7 @@
                        kunmap_atomic(vaddr);
 --- a/arch/mips/mm/init.c
 +++ b/arch/mips/mm/init.c
-@@ -155,7 +155,7 @@ void copy_user_highpage(struct page *to,
+@@ -160,7 +160,7 @@ void copy_user_highpage(struct page *to,
        void *vfrom, *vto;
  
        vto = kmap_atomic(to);
@@ -50,7 +50,7 @@
            page_mapped(from) && !Page_dcache_dirty(from)) {
                vfrom = kmap_coherent(from, vaddr);
                copy_page(vto, vfrom);
-@@ -177,7 +177,7 @@ void copy_to_user_page(struct vm_area_st
+@@ -182,7 +182,7 @@ void copy_to_user_page(struct vm_area_st
        struct page *page, unsigned long vaddr, void *dst, const void *src,
        unsigned long len)
  {
@@ -59,7 +59,7 @@
            page_mapped(page) && !Page_dcache_dirty(page)) {
                void *vto = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
                memcpy(vto, src, len);
-@@ -195,7 +195,7 @@ void copy_from_user_page(struct vm_area_
+@@ -200,7 +200,7 @@ void copy_from_user_page(struct vm_area_
        struct page *page, unsigned long vaddr, void *dst, const void *src,
        unsigned long len)
  {

diff --git a/target/linux/brcm47xx/patches-4.0/209-b44-register-adm-switch.patch b/target/linux/brcm47xx/patches-4.1/209-b44-register-adm-switch.patch
similarity index 97%
rename from target/linux/brcm47xx/patches-4.0/209-b44-register-adm-switch.patch
rename to target/linux/brcm47xx/patches-4.1/209-b44-register-adm-switch.patch
index 9396e947d5eccd5ead9879d107c6e608368e10f0..777744c988e877327d86b5cc33583dd8dc6c2f86 100644 (file)
--- a/target/linux/brcm47xx/patches-4.0/209-b44-register-adm-switch.patch
+++ b/target/linux/brcm47xx/patches-4.1/209-b44-register-adm-switch.patch
@@ -100,14 +100,14 @@ Subject: [PATCH 210/210] b44: register adm switch
                dev_info(sdev->dev,
                         "could not find PHY at %i, use fixed one\n",
                         bp->phy_addr);
-@@ -2478,6 +2547,7 @@ static void b44_remove_one(struct ssb_de
+@@ -2479,6 +2548,7 @@ static void b44_remove_one(struct ssb_de
        unregister_netdev(dev);
        if (bp->flags & B44_FLAG_EXTERNAL_PHY)
                b44_unregister_phy_one(bp);
 +      b44_unregister_adm_switch(bp);
        ssb_device_disable(sdev, 0);
        ssb_bus_may_powerdown(sdev->bus);
-       free_netdev(dev);
+       netif_napi_del(&bp->napi);
 --- a/drivers/net/ethernet/broadcom/b44.h
 +++ b/drivers/net/ethernet/broadcom/b44.h
 @@ -404,6 +404,9 @@ struct b44 {

diff --git a/target/linux/brcm47xx/patches-4.0/210-b44_phy_fix.patch b/target/linux/brcm47xx/patches-4.1/210-b44_phy_fix.patch
similarity index 100%
rename from target/linux/brcm47xx/patches-4.0/210-b44_phy_fix.patch
rename to target/linux/brcm47xx/patches-4.1/210-b44_phy_fix.patch

diff --git a/target/linux/brcm47xx/patches-4.0/280-activate_ssb_support_in_usb.patch b/target/linux/brcm47xx/patches-4.1/280-activate_ssb_support_in_usb.patch
similarity index 100%
rename from target/linux/brcm47xx/patches-4.0/280-activate_ssb_support_in_usb.patch
rename to target/linux/brcm47xx/patches-4.1/280-activate_ssb_support_in_usb.patch

diff --git a/target/linux/brcm47xx/patches-4.0/300-fork_cacheflush.patch b/target/linux/brcm47xx/patches-4.1/300-fork_cacheflush.patch
similarity index 100%
rename from target/linux/brcm47xx/patches-4.0/300-fork_cacheflush.patch
rename to target/linux/brcm47xx/patches-4.1/300-fork_cacheflush.patch

diff --git a/target/linux/brcm47xx/patches-4.0/310-no_highpage.patch b/target/linux/brcm47xx/patches-4.1/310-no_highpage.patch
similarity index 90%
rename from target/linux/brcm47xx/patches-4.0/310-no_highpage.patch
rename to target/linux/brcm47xx/patches-4.1/310-no_highpage.patch
index 41542a0121056526a7a3646965e8f5482a25bddc..5598aaedac8681d20be97e26e39ca7833c751f12 100644 (file)
--- a/target/linux/brcm47xx/patches-4.0/310-no_highpage.patch
+++ b/target/linux/brcm47xx/patches-4.1/310-no_highpage.patch
@@ -8,12 +8,10 @@
  
  extern void build_clear_page(void);
  extern void build_copy_page(void);
-@@ -105,13 +106,16 @@ static inline void clear_user_page(void
+@@ -105,11 +106,16 @@ static inline void clear_user_page(void
                flush_data_cache_page((unsigned long)addr);
  }
  
--extern void copy_user_page(void *vto, void *vfrom, unsigned long vaddr,
--      struct page *to);
 -struct vm_area_struct;
 -extern void copy_user_highpage(struct page *to, struct page *from,
 -      unsigned long vaddr, struct vm_area_struct *vma);
@@ -33,7 +31,7 @@
   * These are used to make use of C type-checking..
 --- a/arch/mips/mm/init.c
 +++ b/arch/mips/mm/init.c
-@@ -149,30 +149,6 @@ void kunmap_coherent(void)
+@@ -154,30 +154,6 @@ void kunmap_coherent(void)
        pagefault_enable();
  }
  

diff --git a/target/linux/brcm47xx/patches-4.0/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch b/target/linux/brcm47xx/patches-4.1/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch
similarity index 100%
rename from target/linux/brcm47xx/patches-4.0/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch
rename to target/linux/brcm47xx/patches-4.1/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch

diff --git a/target/linux/brcm47xx/patches-4.0/400-mtd-bcm47xxpart-get-nvram.patch b/target/linux/brcm47xx/patches-4.1/400-mtd-bcm47xxpart-get-nvram.patch
similarity index 100%
rename from target/linux/brcm47xx/patches-4.0/400-mtd-bcm47xxpart-get-nvram.patch
rename to target/linux/brcm47xx/patches-4.1/400-mtd-bcm47xxpart-get-nvram.patch

diff --git a/target/linux/brcm47xx/patches-4.0/610-pci_ide_fix.patch b/target/linux/brcm47xx/patches-4.1/610-pci_ide_fix.patch
similarity index 100%
rename from target/linux/brcm47xx/patches-4.0/610-pci_ide_fix.patch
rename to target/linux/brcm47xx/patches-4.1/610-pci_ide_fix.patch

diff --git a/target/linux/brcm47xx/patches-4.0/791-tg3-no-pci-sleep.patch b/target/linux/brcm47xx/patches-4.1/791-tg3-no-pci-sleep.patch
similarity index 100%
rename from target/linux/brcm47xx/patches-4.0/791-tg3-no-pci-sleep.patch
rename to target/linux/brcm47xx/patches-4.1/791-tg3-no-pci-sleep.patch

diff --git a/target/linux/brcm47xx/patches-4.0/800-bcma-add-table-of-serial-flashes-with-smaller-blocks.patch b/target/linux/brcm47xx/patches-4.1/800-bcma-add-table-of-serial-flashes-with-smaller-blocks.patch
similarity index 100%
rename from target/linux/brcm47xx/patches-4.0/800-bcma-add-table-of-serial-flashes-with-smaller-blocks.patch
rename to target/linux/brcm47xx/patches-4.1/800-bcma-add-table-of-serial-flashes-with-smaller-blocks.patch

diff --git a/target/linux/brcm47xx/patches-4.0/820-wgt634u-nvram-fix.patch b/target/linux/brcm47xx/patches-4.1/820-wgt634u-nvram-fix.patch
similarity index 100%
rename from target/linux/brcm47xx/patches-4.0/820-wgt634u-nvram-fix.patch
rename to target/linux/brcm47xx/patches-4.1/820-wgt634u-nvram-fix.patch

diff --git a/target/linux/brcm47xx/patches-4.0/830-huawei_e970_support.patch b/target/linux/brcm47xx/patches-4.1/830-huawei_e970_support.patch
similarity index 100%
rename from target/linux/brcm47xx/patches-4.0/830-huawei_e970_support.patch
rename to target/linux/brcm47xx/patches-4.1/830-huawei_e970_support.patch

diff --git a/target/linux/brcm47xx/patches-4.0/900-ssb-reject-PCI-writes-setting-CardBus-bridge-resourc.patch b/target/linux/brcm47xx/patches-4.1/900-ssb-reject-PCI-writes-setting-CardBus-bridge-resourc.patch
similarity index 100%
rename from target/linux/brcm47xx/patches-4.0/900-ssb-reject-PCI-writes-setting-CardBus-bridge-resourc.patch
rename to target/linux/brcm47xx/patches-4.1/900-ssb-reject-PCI-writes-setting-CardBus-bridge-resourc.patch

diff --git a/target/linux/brcm47xx/patches-4.0/920-cache-wround.patch b/target/linux/brcm47xx/patches-4.1/920-cache-wround.patch
similarity index 90%
rename from target/linux/brcm47xx/patches-4.0/920-cache-wround.patch
rename to target/linux/brcm47xx/patches-4.1/920-cache-wround.patch
index 39ed07cc86ad412131bf8f81e80f7542b51d88ab..e26d98afa525af2eda5cd322da0cd53674183a15 100644 (file)
--- a/target/linux/brcm47xx/patches-4.0/920-cache-wround.patch
+++ b/target/linux/brcm47xx/patches-4.1/920-cache-wround.patch
@@ -34,7 +34,7 @@
  
 --- a/arch/mips/mm/tlbex.c
 +++ b/arch/mips/mm/tlbex.c
-@@ -924,6 +924,9 @@ build_get_pgde32(u32 **p, unsigned int t
+@@ -936,6 +936,9 @@ build_get_pgde32(u32 **p, unsigned int t
                uasm_i_srl(p, ptr, ptr, SMP_CPUID_PTRSHIFT);
                uasm_i_addu(p, ptr, tmp, ptr);
  #else
@@ -44,7 +44,7 @@
                UASM_i_LA_mostly(p, ptr, pgdc);
  #endif
                uasm_i_mfc0(p, tmp, C0_BADVADDR); /* get faulting address */
-@@ -1269,12 +1272,12 @@ static void build_r4000_tlb_refill_handl
+@@ -1296,12 +1299,12 @@ static void build_r4000_tlb_refill_handl
                        /* No need for uasm_i_nop */
                }
  
@@ -60,7 +60,7 @@
                build_get_pgde32(&p, K0, K1); /* get pgd in K1 */
  #endif
  
-@@ -1286,6 +1289,9 @@ static void build_r4000_tlb_refill_handl
+@@ -1313,6 +1316,9 @@ static void build_r4000_tlb_refill_handl
                build_update_entries(&p, K0, K1);
                build_tlb_write_entry(&p, &l, &r, tlb_random);
                uasm_l_leave(&l, p);
@@ -70,7 +70,7 @@
                uasm_i_eret(&p); /* return from trap */
        }
  #ifdef CONFIG_MIPS_HUGE_TLB_SUPPORT
-@@ -1834,12 +1840,12 @@ build_r4000_tlbchange_handler_head(u32 *
+@@ -1871,12 +1877,12 @@ build_r4000_tlbchange_handler_head(u32 *
  {
        struct work_registers wr = build_get_work_registers(p);
  
@@ -86,7 +86,7 @@
        build_get_pgde32(p, wr.r1, wr.r2); /* get pgd in ptr */
  #endif
  
-@@ -1886,6 +1892,9 @@ build_r4000_tlbchange_handler_tail(u32 *
+@@ -1923,6 +1929,9 @@ build_r4000_tlbchange_handler_tail(u32 *
        build_tlb_write_entry(p, l, r, tlb_indexed);
        uasm_l_leave(l, *p);
        build_restore_work_registers(p);

diff --git a/target/linux/brcm47xx/patches-4.0/940-bcm47xx-yenta.patch b/target/linux/brcm47xx/patches-4.1/940-bcm47xx-yenta.patch
similarity index 96%
rename from target/linux/brcm47xx/patches-4.0/940-bcm47xx-yenta.patch
rename to target/linux/brcm47xx/patches-4.1/940-bcm47xx-yenta.patch
index 1739ff78abc7d547790d201df69e91f2bb3c98c7..77c10fcebb2b0f059298ed919503322ffab96edf 100644 (file)
--- a/target/linux/brcm47xx/patches-4.0/940-bcm47xx-yenta.patch
+++ b/target/linux/brcm47xx/patches-4.1/940-bcm47xx-yenta.patch
@@ -28,7 +28,7 @@
        dev_printk(KERN_INFO, &socket->dev->dev,
                   "ISA IRQ mask 0x%04x, PCI irq %d\n",
                   socket->socket.irq_mask, socket->cb_irq);
-@@ -1257,6 +1264,15 @@ static int yenta_probe(struct pci_dev *d
+@@ -1255,6 +1262,15 @@ static int yenta_probe(struct pci_dev *d
        dev_printk(KERN_INFO, &dev->dev,
                   "Socket status: %08x\n", cb_readl(socket, CB_SOCKET_STATE));
  

diff --git a/target/linux/brcm47xx/patches-4.0/976-ssb_increase_pci_delay.patch b/target/linux/brcm47xx/patches-4.1/976-ssb_increase_pci_delay.patch
similarity index 100%
rename from target/linux/brcm47xx/patches-4.0/976-ssb_increase_pci_delay.patch
rename to target/linux/brcm47xx/patches-4.1/976-ssb_increase_pci_delay.patch

diff --git a/target/linux/brcm47xx/patches-4.0/999-wl_exports.patch b/target/linux/brcm47xx/patches-4.1/999-wl_exports.patch
similarity index 100%
rename from target/linux/brcm47xx/patches-4.0/999-wl_exports.patch
rename to target/linux/brcm47xx/patches-4.1/999-wl_exports.patch