Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90b90f60 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
parents 769162e3 36eb22e9

Documentation/DocBook/80211.tmpl

+0 −1
Original line number Diff line number Diff line
@@ -404,7 +404,6 @@ 
!Finclude/net/mac80211.h ieee80211_get_tkip_p1k

!Finclude/net/mac80211.h ieee80211_get_tkip_p1k_iv

!Finclude/net/mac80211.h ieee80211_get_tkip_p2k

!Finclude/net/mac80211.h ieee80211_key_removed

      </chapter>



      <chapter id="powersave">

drivers/bcma/Kconfig

+19 −0
Original line number Diff line number Diff line
@@ -46,6 +46,25 @@ config BCMA_DRIVER_MIPS 


	  If unsure, say N



config BCMA_SFLASH

	bool

	depends on BCMA_DRIVER_MIPS && BROKEN

	default y



config BCMA_NFLASH

	bool

	depends on BCMA_DRIVER_MIPS && BROKEN

	default y



config BCMA_DRIVER_GMAC_CMN

	bool "BCMA Broadcom GBIT MAC COMMON core driver"

	depends on BCMA

	help

	  Driver for the Broadcom GBIT MAC COMMON core attached to Broadcom

	  specific Advanced Microcontroller Bus.



	  If unsure, say N



config BCMA_DEBUG

	bool "BCMA debugging"

	depends on BCMA

drivers/bcma/Makefile

+3 −0
Original line number Diff line number Diff line 
bcma-y					+= main.o scan.o core.o sprom.o

bcma-y					+= driver_chipcommon.o driver_chipcommon_pmu.o

bcma-$(CONFIG_BCMA_SFLASH)		+= driver_chipcommon_sflash.o

bcma-$(CONFIG_BCMA_NFLASH)		+= driver_chipcommon_nflash.o

bcma-y					+= driver_pci.o

bcma-$(CONFIG_BCMA_DRIVER_PCI_HOSTMODE)	+= driver_pci_host.o

bcma-$(CONFIG_BCMA_DRIVER_MIPS)		+= driver_mips.o

bcma-$(CONFIG_BCMA_DRIVER_GMAC_CMN)	+= driver_gmac_cmn.o

bcma-$(CONFIG_BCMA_HOST_PCI)		+= host_pci.o

bcma-$(CONFIG_BCMA_HOST_SOC)		+= host_soc.o

obj-$(CONFIG_BCMA)			+= bcma.o

drivers/bcma/bcma_private.h

+22 −0
Original line number Diff line number Diff line
@@ -51,6 +51,28 @@ void bcma_chipco_serial_init(struct bcma_drv_cc *cc); 
u32 bcma_pmu_alp_clock(struct bcma_drv_cc *cc);

u32 bcma_pmu_get_clockcpu(struct bcma_drv_cc *cc);



#ifdef CONFIG_BCMA_SFLASH

/* driver_chipcommon_sflash.c */

int bcma_sflash_init(struct bcma_drv_cc *cc);

#else

static inline int bcma_sflash_init(struct bcma_drv_cc *cc)

{

	bcma_err(cc->core->bus, "Serial flash not supported\n");

	return 0;

}

#endif /* CONFIG_BCMA_SFLASH */



#ifdef CONFIG_BCMA_NFLASH

/* driver_chipcommon_nflash.c */

int bcma_nflash_init(struct bcma_drv_cc *cc);

#else

static inline int bcma_nflash_init(struct bcma_drv_cc *cc)

{

	bcma_err(cc->core->bus, "NAND flash not supported\n");

	return 0;

}

#endif /* CONFIG_BCMA_NFLASH */



#ifdef CONFIG_BCMA_HOST_PCI

/* host_pci.c */

extern int __init bcma_host_pci_init(void);

drivers/bcma/driver_chipcommon_nflash.c

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/*

 * Broadcom specific AMBA

 * ChipCommon NAND flash interface

 *

 * Licensed under the GNU/GPL. See COPYING for details.

 */



#include <linux/bcma/bcma.h>

#include <linux/bcma/bcma_driver_chipcommon.h>

#include <linux/delay.h>



#include "bcma_private.h"



/* Initialize NAND flash access */

int bcma_nflash_init(struct bcma_drv_cc *cc)

{

	bcma_err(cc->core->bus, "NAND flash support is broken\n");

	return 0;

}