| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182 |
- From 0509f6dcc46d10ea4bb8c70494dc7ae11bcb3f01 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 21:14:10 +0100
- Subject: [PATCH] firmware: backport NVRAM driver
- MIME-Version: 1.0
- Content-Type: text/plain; charset=UTF-8
- Content-Transfer-Encoding: 8bit
- Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
- ---
- arch/arm/Kconfig | 2 ++
- drivers/firmware/Kconfig | 1 +
- drivers/firmware/Makefile | 1 +
- drivers/net/ethernet/broadcom/b44.c | 2 +-
- drivers/net/ethernet/broadcom/bgmac.c | 2 +-
- drivers/ssb/driver_chipcommon_pmu.c | 2 +-
- 6 files changed, 7 insertions(+), 3 deletions(-)
- --- a/arch/arm/Kconfig
- +++ b/arch/arm/Kconfig
- @@ -2166,6 +2166,8 @@ source "net/Kconfig"
-
- source "drivers/Kconfig"
-
- +source "drivers/firmware/Kconfig"
- +
- source "fs/Kconfig"
-
- source "arch/arm/Kconfig.debug"
- --- a/drivers/firmware/Kconfig
- +++ b/drivers/firmware/Kconfig
- @@ -132,6 +132,7 @@ config ISCSI_IBFT
- detect iSCSI boot parameters dynamically during system boot, say Y.
- Otherwise, say N.
-
- +source "drivers/firmware/broadcom/Kconfig"
- source "drivers/firmware/google/Kconfig"
- source "drivers/firmware/efi/Kconfig"
-
- --- a/drivers/firmware/Makefile
- +++ b/drivers/firmware/Makefile
- @@ -12,6 +12,7 @@ obj-$(CONFIG_ISCSI_IBFT_FIND) += iscsi_i
- obj-$(CONFIG_ISCSI_IBFT) += iscsi_ibft.o
- obj-$(CONFIG_FIRMWARE_MEMMAP) += memmap.o
-
- +obj-y += broadcom/
- obj-$(CONFIG_GOOGLE_FIRMWARE) += google/
- obj-$(CONFIG_EFI) += efi/
- obj-$(CONFIG_UEFI_CPER) += efi/
- --- 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"
|
