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/net/ethernet/broadcom/b44.c   | 2 +-
  15  drivers/net/ethernet/broadcom/bgmac.c | 2 +-
  16  drivers/ssb/driver_chipcommon_pmu.c   | 2 +-
  17  6 files changed, 7 insertions(+), 3 deletions(-)
  18
  19 --- a/arch/arm/Kconfig
  20 +++ b/arch/arm/Kconfig
  21 @@ -2166,6 +2166,8 @@ source "net/Kconfig"
  22
  23  source "drivers/Kconfig"
  24
  25 +source "drivers/firmware/Kconfig"
  26 +
  27  source "fs/Kconfig"
  28
  29  source "arch/arm/Kconfig.debug"
  30 --- a/drivers/firmware/Kconfig
  31 +++ b/drivers/firmware/Kconfig
  32 @@ -132,6 +132,7 @@ config ISCSI_IBFT
  33           detect iSCSI boot parameters dynamically during system boot, say Y.
  34           Otherwise, say N.
  35
  36 +source "drivers/firmware/broadcom/Kconfig"
  37  source "drivers/firmware/google/Kconfig"
  38  source "drivers/firmware/efi/Kconfig"
  39
  40 --- a/drivers/firmware/Makefile
  41 +++ b/drivers/firmware/Makefile
  42 @@ -12,6 +12,7 @@ obj-$(CONFIG_ISCSI_IBFT_FIND) += iscsi_i
  43  obj-$(CONFIG_ISCSI_IBFT)       += iscsi_ibft.o
  44  obj-$(CONFIG_FIRMWARE_MEMMAP)  += memmap.o
  45
  46 +obj-y                          += broadcom/
  47  obj-$(CONFIG_GOOGLE_FIRMWARE)  += google/
  48  obj-$(CONFIG_EFI)              += efi/
  49  obj-$(CONFIG_UEFI_CPER)                += efi/
  50 --- a/drivers/net/ethernet/broadcom/b44.c
  51 +++ b/drivers/net/ethernet/broadcom/b44.c
  52 @@ -400,7 +400,7 @@ static void b44_set_flow_ctrl(struct b44
  53  }
  54
  55  #ifdef CONFIG_BCM47XX
  56 -#include <bcm47xx_nvram.h>
  57 +#include <linux/bcm47xx_nvram.h>
  58  static void b44_wap54g10_workaround(struct b44 *bp)
  59  {
  60         char buf[20];
  61 --- a/drivers/net/ethernet/broadcom/bgmac.c
  62 +++ b/drivers/net/ethernet/broadcom/bgmac.c
  63 @@ -18,7 +18,7 @@
  64  #include <linux/interrupt.h>
  65  #include <linux/dma-mapping.h>
  66  #include <linux/platform_data/b53.h>
  67 -#include <bcm47xx_nvram.h>
  68 +#include <linux/bcm47xx_nvram.h>
  69
  70  static const struct bcma_device_id bgmac_bcma_tbl[] = {
  71         BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_4706_MAC_GBIT, BCMA_ANY_REV, BCMA_ANY_CLASS),
  72 --- a/drivers/ssb/driver_chipcommon_pmu.c
  73 +++ b/drivers/ssb/driver_chipcommon_pmu.c
  74 @@ -14,7 +14,7 @@
  75  #include <linux/delay.h>
  76  #include <linux/export.h>
  77  #ifdef CONFIG_BCM47XX
  78 -#include <bcm47xx_nvram.h>
  79 +#include <linux/bcm47xx_nvram.h>
  80  #endif
  81
  82  #include "ssb_private.h"