Commit 28c0f02f authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-next-for-davem-2015-03-06' of... 

Merge tag 'wireless-drivers-next-for-davem-2015-03-06' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next



Major changes:

brcmfmac:

* sdio improvements
* add a debugfs file so users can provide us all the revinfo we could
  ask for

iwlwifi:

* add triggers for firmware dump collection
* remove support for -9.ucode
* new statitics API
* rate control improvements

ath9k:

* add per-vif TX power capability
* BT coexistance fixes

ath10k:

* qca6174: enable STA transmit beamforming (TxBF) support
* disable multi-vif power save by default

bcma:

* enable support for PCIe Gen 2 host devices

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 89650ad0 1ca2760f

drivers/bcma/Kconfig

+18 −1
Original line number Diff line number Diff line 
config BCMA_POSSIBLE

	bool

	depends on HAS_IOMEM && HAS_DMA

	depends on HAS_IOMEM && HAS_DMA && PCI

	default y



menu "Broadcom specific AMBA"
@@ -26,6 +26,7 @@ config BCMA_HOST_PCI_POSSIBLE 
config BCMA_HOST_PCI

	bool "Support for BCMA on PCI-host bus"

	depends on BCMA_HOST_PCI_POSSIBLE

	select BCMA_DRIVER_PCI

	default y



config BCMA_DRIVER_PCI_HOSTMODE
@@ -44,6 +45,22 @@ config BCMA_HOST_SOC 


	  If unsure, say N



# TODO: make it depend on PCI when ready

config BCMA_DRIVER_PCI

	bool

	default y

	help

	  BCMA bus may have many versions of PCIe core. This driver

	  supports:

	  1) PCIe core working in clientmode

	  2) PCIe Gen 2 clientmode core



	  In general PCIe (Gen 2) clientmode core is required on PCIe

	  hosted buses. It's responsible for initialization and basic

	  hardware management.

	  This driver is also prerequisite for a hostmode PCIe core

	  support.



config BCMA_DRIVER_MIPS

	bool "BCMA Broadcom MIPS core driver"

	depends on BCMA && MIPS

drivers/bcma/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ bcma-y += driver_chipcommon.o driver_chipcommon_pmu.o 
bcma-y					+= driver_chipcommon_b.o

bcma-$(CONFIG_BCMA_SFLASH)		+= driver_chipcommon_sflash.o

bcma-$(CONFIG_BCMA_NFLASH)		+= driver_chipcommon_nflash.o

bcma-y					+= driver_pci.o

bcma-y					+= driver_pcie2.o

bcma-$(CONFIG_BCMA_DRIVER_PCI)		+= driver_pci.o

bcma-$(CONFIG_BCMA_DRIVER_PCI)		+= driver_pcie2.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

drivers/bcma/bcma_private.h

+47 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ bool bcma_wait_value(struct bcma_device *core, u16 reg, u32 mask, u32 value, 
		     int timeout);

void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core);

void bcma_init_bus(struct bcma_bus *bus);

void bcma_unregister_cores(struct bcma_bus *bus);

int bcma_bus_register(struct bcma_bus *bus);

void bcma_bus_unregister(struct bcma_bus *bus);

int __init bcma_bus_early_register(struct bcma_bus *bus);
@@ -42,6 +43,9 @@ int bcma_bus_scan(struct bcma_bus *bus); 
int bcma_sprom_get(struct bcma_bus *bus);



/* driver_chipcommon.c */

void bcma_core_chipcommon_early_init(struct bcma_drv_cc *cc);

void bcma_core_chipcommon_init(struct bcma_drv_cc *cc);

void bcma_chipco_bcm4331_ext_pa_lines_ctl(struct bcma_drv_cc *cc, bool enable);

#ifdef CONFIG_BCMA_DRIVER_MIPS

void bcma_chipco_serial_init(struct bcma_drv_cc *cc);

extern struct platform_device bcma_pflash_dev;
@@ -52,6 +56,8 @@ int bcma_core_chipcommon_b_init(struct bcma_drv_cc_b *ccb); 
void bcma_core_chipcommon_b_free(struct bcma_drv_cc_b *ccb);



/* driver_chipcommon_pmu.c */

void bcma_pmu_early_init(struct bcma_drv_cc *cc);

void bcma_pmu_init(struct bcma_drv_cc *cc);

u32 bcma_pmu_get_alp_clock(struct bcma_drv_cc *cc);

u32 bcma_pmu_get_cpu_clock(struct bcma_drv_cc *cc);
@@ -101,6 +107,14 @@ static inline void __exit bcma_host_soc_unregister_driver(void) 


/* driver_pci.c */

u32 bcma_pcie_read(struct bcma_drv_pci *pc, u32 address);

void bcma_core_pci_early_init(struct bcma_drv_pci *pc);

void bcma_core_pci_init(struct bcma_drv_pci *pc);

void bcma_core_pci_up(struct bcma_drv_pci *pc);

void bcma_core_pci_down(struct bcma_drv_pci *pc);



/* driver_pcie2.c */

void bcma_core_pcie2_init(struct bcma_drv_pcie2 *pcie2);

void bcma_core_pcie2_up(struct bcma_drv_pcie2 *pcie2);



extern int bcma_chipco_watchdog_register(struct bcma_drv_cc *cc);
@@ -117,6 +131,39 @@ static inline void bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc) 
}

#endif /* CONFIG_BCMA_DRIVER_PCI_HOSTMODE */



/**************************************************

 * driver_mips.c

 **************************************************/



#ifdef CONFIG_BCMA_DRIVER_MIPS

unsigned int bcma_core_mips_irq(struct bcma_device *dev);

void bcma_core_mips_early_init(struct bcma_drv_mips *mcore);

void bcma_core_mips_init(struct bcma_drv_mips *mcore);

#else

static inline unsigned int bcma_core_mips_irq(struct bcma_device *dev)

{

	return 0;

}

static inline void bcma_core_mips_early_init(struct bcma_drv_mips *mcore)

{

}

static inline void bcma_core_mips_init(struct bcma_drv_mips *mcore)

{

}

#endif



/**************************************************

 * driver_gmac_cmn.c

 **************************************************/



#ifdef CONFIG_BCMA_DRIVER_GMAC_CMN

void bcma_core_gmac_cmn_init(struct bcma_drv_gmac_cmn *gc);

#else

static inline void bcma_core_gmac_cmn_init(struct bcma_drv_gmac_cmn *gc)

{

}

#endif



#ifdef CONFIG_BCMA_DRIVER_GPIO

/* driver_gpio.c */

int bcma_gpio_init(struct bcma_drv_cc *cc);

drivers/bcma/driver_gpio.c

+2 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static void bcma_gpio_free(struct gpio_chip *chip, unsigned gpio) 
	bcma_chipco_gpio_pullup(cc, 1 << gpio, 0);

}



#if IS_BUILTIN(CONFIG_BCM47XX)

#if IS_BUILTIN(CONFIG_BCM47XX) || IS_BUILTIN(CONFIG_ARCH_BCM_5301X)

static int bcma_gpio_to_irq(struct gpio_chip *chip, unsigned gpio)

{

	struct bcma_drv_cc *cc = bcma_gpio_get_cc(chip);
@@ -215,7 +215,7 @@ int bcma_gpio_init(struct bcma_drv_cc *cc) 
	chip->set		= bcma_gpio_set_value;

	chip->direction_input	= bcma_gpio_direction_input;

	chip->direction_output	= bcma_gpio_direction_output;

#if IS_BUILTIN(CONFIG_BCM47XX)

#if IS_BUILTIN(CONFIG_BCM47XX) || IS_BUILTIN(CONFIG_ARCH_BCM_5301X)

	chip->to_irq		= bcma_gpio_to_irq;

#endif

#if IS_BUILTIN(CONFIG_OF)

drivers/bcma/driver_pci.c

+5 −21
Original line number Diff line number Diff line
@@ -282,21 +282,21 @@ void bcma_core_pci_power_save(struct bcma_bus *bus, bool up) 
}

EXPORT_SYMBOL_GPL(bcma_core_pci_power_save);



int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc, struct bcma_device *core,

int bcma_core_pci_irq_ctl(struct bcma_bus *bus, struct bcma_device *core,

			  bool enable)

{

	struct pci_dev *pdev;

	u32 coremask, tmp;

	int err = 0;



	if (!pc || core->bus->hosttype != BCMA_HOSTTYPE_PCI) {

	if (bus->hosttype != BCMA_HOSTTYPE_PCI) {

		/* This bcma device is not on a PCI host-bus. So the IRQs are

		 * not routed through the PCI core.

		 * So we must not enable routing through the PCI core. */

		goto out;

	}



	pdev = pc->core->bus->host_pci;

	pdev = bus->host_pci;



	err = pci_read_config_dword(pdev, BCMA_PCI_IRQMASK, &tmp);

	if (err)
@@ -328,28 +328,12 @@ static void bcma_core_pci_extend_L1timer(struct bcma_drv_pci *pc, bool extend) 
	bcma_pcie_read(pc, BCMA_CORE_PCI_DLLP_PMTHRESHREG);

}



void bcma_core_pci_up(struct bcma_bus *bus)

void bcma_core_pci_up(struct bcma_drv_pci *pc)

{

	struct bcma_drv_pci *pc;



	if (bus->hosttype != BCMA_HOSTTYPE_PCI)

		return;



	pc = &bus->drv_pci[0];



	bcma_core_pci_extend_L1timer(pc, true);

}

EXPORT_SYMBOL_GPL(bcma_core_pci_up);



void bcma_core_pci_down(struct bcma_bus *bus)

void bcma_core_pci_down(struct bcma_drv_pci *pc)

{

	struct bcma_drv_pci *pc;



	if (bus->hosttype != BCMA_HOSTTYPE_PCI)

		return;



	pc = &bus->drv_pci[0];



	bcma_core_pci_extend_L1timer(pc, false);

}
 
EXPORT_SYMBOL_GPL(bcma_core_pci_down);

CRA Git | Maintained and supported by SUSTech CRA and CCSE