target/linux/bcm53xx/patches-3.18/110-firmware-backport-NVRAM-driver.patch

   1 From 0509f6dcc46d10ea4bb8c70494dc7ae11bcb3f01 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
   3 Date: Wed, 10 Dec 2014 21:14:10 +0100
   4 Subject: [PATCH] firmware: backport NVRAM driver
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
  10 ---
  11  arch/arm/Kconfig                          | 2 ++
  12  drivers/firmware/Kconfig                  | 1 +
  13  drivers/firmware/Makefile                 | 1 +
  14  drivers/firmware/broadcom/bcm47xx_nvram.c | 3 ++-
  15  drivers/net/ethernet/broadcom/b44.c       | 2 +-
  16  drivers/net/ethernet/broadcom/bgmac.c     | 2 +-
  17  drivers/ssb/driver_chipcommon_pmu.c       | 2 +-
  18  7 files changed, 9 insertions(+), 4 deletions(-)
  19
  20 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
  21 index 4733d32..ab18030 100644
  22 --- a/arch/arm/Kconfig
  23 +++ b/arch/arm/Kconfig
  24 @@ -2166,6 +2166,8 @@ source "net/Kconfig"
  25
  26  source "drivers/Kconfig"
  27
  28 +source "drivers/firmware/Kconfig"
  29 +
  30  source "fs/Kconfig"
  31
  32  source "arch/arm/Kconfig.debug"
  33 diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
  34 index 4198388..ffbc9e4 100644
  35 --- a/drivers/firmware/Kconfig
  36 +++ b/drivers/firmware/Kconfig
  37 @@ -132,6 +132,7 @@ config ISCSI_IBFT
  38           detect iSCSI boot parameters dynamically during system boot, say Y.
  39           Otherwise, say N.
  40
  41 +source "drivers/firmware/broadcom/Kconfig"
  42  source "drivers/firmware/google/Kconfig"
  43  source "drivers/firmware/efi/Kconfig"
  44
  45 diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile
  46 index 5373dc5..e251f2b 100644
  47 --- a/drivers/firmware/Makefile
  48 +++ b/drivers/firmware/Makefile
  49 @@ -12,6 +12,7 @@ obj-$(CONFIG_ISCSI_IBFT_FIND) += iscsi_ibft_find.o
  50  obj-$(CONFIG_ISCSI_IBFT)       += iscsi_ibft.o
  51  obj-$(CONFIG_FIRMWARE_MEMMAP)  += memmap.o
  52
  53 +obj-y                          += broadcom/
  54  obj-$(CONFIG_GOOGLE_FIRMWARE)  += google/
  55  obj-$(CONFIG_EFI)              += efi/
  56  obj-$(CONFIG_UEFI_CPER)                += efi/
  57 diff --git a/drivers/firmware/broadcom/bcm47xx_nvram.c b/drivers/firmware/broadcom/bcm47xx_nvram.c
  58 index b6e1cc7..8ca7358 100644
  59 --- a/drivers/firmware/broadcom/bcm47xx_nvram.c
  60 +++ b/drivers/firmware/broadcom/bcm47xx_nvram.c
  61 @@ -11,6 +11,7 @@
  62   * option) any later version.
  63   */
  64
  65 +#include <linux/io.h>
  66  #include <linux/types.h>
  67  #include <linux/module.h>
  68  #include <linux/kernel.h>
  69 @@ -34,7 +35,7 @@ struct nvram_header {
  70  };
  71
  72  static char nvram_buf[NVRAM_SPACE];
  73 -static const u32 nvram_sizes[] = {0x8000, 0xF000, 0x10000};
  74 +static const u32 nvram_sizes[] = {0x8000, 0xF000, 0x10000, 0x160000, 0x180000};
  75
  76  static u32 find_nvram_size(void __iomem *end)
  77  {
  78 diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c
  79 index 8a7bf7d..bf3bcd6 100644
  80 --- a/drivers/net/ethernet/broadcom/b44.c
  81 +++ b/drivers/net/ethernet/broadcom/b44.c
  82 @@ -400,7 +400,7 @@ static void b44_set_flow_ctrl(struct b44 *bp, u32 local, u32 remote)
  83  }
  84
  85  #ifdef CONFIG_BCM47XX
  86 -#include <bcm47xx_nvram.h>
  87 +#include <linux/bcm47xx_nvram.h>
  88  static void b44_wap54g10_workaround(struct b44 *bp)
  89  {
  90         char buf[20];
  91 diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
  92 index 34c7bc8..943707f 100644
  93 --- a/drivers/net/ethernet/broadcom/bgmac.c
  94 +++ b/drivers/net/ethernet/broadcom/bgmac.c
  95 @@ -17,7 +17,7 @@
  96  #include <linux/interrupt.h>
  97  #include <linux/dma-mapping.h>
  98  #include <linux/platform_data/b53.h>
  99 -#include <bcm47xx_nvram.h>
 100 +#include <linux/bcm47xx_nvram.h>
 101
 102  static const struct bcma_device_id bgmac_bcma_tbl[] = {
 103         BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_4706_MAC_GBIT, BCMA_ANY_REV, BCMA_ANY_CLASS),
 104 diff --git a/drivers/ssb/driver_chipcommon_pmu.c b/drivers/ssb/driver_chipcommon_pmu.c
 105 index 1173a09..0942841 100644
 106 --- a/drivers/ssb/driver_chipcommon_pmu.c
 107 +++ b/drivers/ssb/driver_chipcommon_pmu.c
 108 @@ -14,7 +14,7 @@
 109  #include <linux/delay.h>
 110  #include <linux/export.h>
 111  #ifdef CONFIG_BCM47XX
 112 -#include <bcm47xx_nvram.h>
 113 +#include <linux/bcm47xx_nvram.h>
 114  #endif
 115
 116  #include "ssb_private.h"
 117 --
 118 1.8.4.5
 119