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
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
9 Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
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(-)
19 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
20 index 4733d32..ab18030 100644
21 --- a/arch/arm/Kconfig
22 +++ b/arch/arm/Kconfig
23 @@ -2166,6 +2166,8 @@ source "net/Kconfig"
25 source "drivers/Kconfig"
27 +source "drivers/firmware/Kconfig"
31 source "arch/arm/Kconfig.debug"
32 diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
33 index 4198388..ffbc9e4 100644
34 --- a/drivers/firmware/Kconfig
35 +++ b/drivers/firmware/Kconfig
36 @@ -132,6 +132,7 @@ config ISCSI_IBFT
37 detect iSCSI boot parameters dynamically during system boot, say Y.
40 +source "drivers/firmware/broadcom/Kconfig"
41 source "drivers/firmware/google/Kconfig"
42 source "drivers/firmware/efi/Kconfig"
44 diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile
45 index 5373dc5..e251f2b 100644
46 --- a/drivers/firmware/Makefile
47 +++ b/drivers/firmware/Makefile
48 @@ -12,6 +12,7 @@ obj-$(CONFIG_ISCSI_IBFT_FIND) += iscsi_ibft_find.o
49 obj-$(CONFIG_ISCSI_IBFT) += iscsi_ibft.o
50 obj-$(CONFIG_FIRMWARE_MEMMAP) += memmap.o
53 obj-$(CONFIG_GOOGLE_FIRMWARE) += google/
54 obj-$(CONFIG_EFI) += efi/
55 obj-$(CONFIG_UEFI_CPER) += efi/
56 diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c
57 index 8a7bf7d..bf3bcd6 100644
58 --- a/drivers/net/ethernet/broadcom/b44.c
59 +++ b/drivers/net/ethernet/broadcom/b44.c
60 @@ -400,7 +400,7 @@ static void b44_set_flow_ctrl(struct b44 *bp, u32 local, u32 remote)
64 -#include <bcm47xx_nvram.h>
65 +#include <linux/bcm47xx_nvram.h>
66 static void b44_wap54g10_workaround(struct b44 *bp)
69 diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
70 index 34c7bc8..943707f 100644
71 --- a/drivers/net/ethernet/broadcom/bgmac.c
72 +++ b/drivers/net/ethernet/broadcom/bgmac.c
74 #include <linux/interrupt.h>
75 #include <linux/dma-mapping.h>
76 #include <linux/platform_data/b53.h>
77 -#include <bcm47xx_nvram.h>
78 +#include <linux/bcm47xx_nvram.h>
80 static const struct bcma_device_id bgmac_bcma_tbl[] = {
81 BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_4706_MAC_GBIT, BCMA_ANY_REV, BCMA_ANY_CLASS),
82 diff --git a/drivers/ssb/driver_chipcommon_pmu.c b/drivers/ssb/driver_chipcommon_pmu.c
83 index 1173a09..0942841 100644
84 --- a/drivers/ssb/driver_chipcommon_pmu.c
85 +++ b/drivers/ssb/driver_chipcommon_pmu.c
87 #include <linux/delay.h>
88 #include <linux/export.h>
90 -#include <bcm47xx_nvram.h>
91 +#include <linux/bcm47xx_nvram.h>
94 #include "ssb_private.h"