Commit 0d8165e9 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

Conflicts:
	drivers/net/wireless/iwlwifi/pcie/trans.c
parents 4c9d546f 076f0d20

Documentation/DocBook/80211.tmpl

+1 −0
Original line number Diff line number Diff line
@@ -325,6 +325,7 @@ 
          <title>functions/definitions</title>

!Finclude/net/mac80211.h ieee80211_rx_status

!Finclude/net/mac80211.h mac80211_rx_flags

!Finclude/net/mac80211.h mac80211_tx_info_flags

!Finclude/net/mac80211.h mac80211_tx_control_flags

!Finclude/net/mac80211.h mac80211_rate_control_flags

!Finclude/net/mac80211.h ieee80211_tx_rate

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -5792,7 +5792,7 @@ M: Aloisio Almeida Jr <aloisio.almeida@openbossa.org> 
M:	Samuel Ortiz <sameo@linux.intel.com>

L:	linux-wireless@vger.kernel.org

L:	linux-nfc@lists.01.org (moderated for non-subscribers)

S:	Maintained

S:	Supported

F:	net/nfc/

F:	include/net/nfc/

F:	include/uapi/linux/nfc.h

drivers/bcma/driver_pci.c

+60 −5
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ static void bcma_pcie_write(struct bcma_drv_pci *pc, u32 address, u32 data) 
	pcicore_write32(pc, BCMA_CORE_PCI_PCIEIND_DATA, data);

}



static void bcma_pcie_mdio_set_phy(struct bcma_drv_pci *pc, u8 phy)

static void bcma_pcie_mdio_set_phy(struct bcma_drv_pci *pc, u16 phy)

{

	u32 v;

	int i;
@@ -55,7 +55,7 @@ static void bcma_pcie_mdio_set_phy(struct bcma_drv_pci *pc, u8 phy) 
	}

}



static u16 bcma_pcie_mdio_read(struct bcma_drv_pci *pc, u8 device, u8 address)

static u16 bcma_pcie_mdio_read(struct bcma_drv_pci *pc, u16 device, u8 address)

{

	int max_retries = 10;

	u16 ret = 0;
@@ -98,7 +98,7 @@ static u16 bcma_pcie_mdio_read(struct bcma_drv_pci *pc, u8 device, u8 address) 
	return ret;

}



static void bcma_pcie_mdio_write(struct bcma_drv_pci *pc, u8 device,

static void bcma_pcie_mdio_write(struct bcma_drv_pci *pc, u16 device,

				u8 address, u16 data)

{

	int max_retries = 10;
@@ -137,6 +137,13 @@ static void bcma_pcie_mdio_write(struct bcma_drv_pci *pc, u8 device, 
	pcicore_write32(pc, BCMA_CORE_PCI_MDIO_CONTROL, 0);

}



static u16 bcma_pcie_mdio_writeread(struct bcma_drv_pci *pc, u16 device,

				    u8 address, u16 data)

{

	bcma_pcie_mdio_write(pc, device, address, data);

	return bcma_pcie_mdio_read(pc, device, address);

}



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

 * Workarounds.

 **************************************************/
@@ -203,6 +210,25 @@ static void bcma_core_pci_config_fixup(struct bcma_drv_pci *pc) 
	}

}



static void bcma_core_pci_power_save(struct bcma_drv_pci *pc, bool up)

{

	u16 data;



	if (pc->core->id.rev >= 15 && pc->core->id.rev <= 20) {

		data = up ? 0x74 : 0x7C;

		bcma_pcie_mdio_writeread(pc, BCMA_CORE_PCI_MDIO_BLK1,

					 BCMA_CORE_PCI_MDIO_BLK1_MGMT1, 0x7F64);

		bcma_pcie_mdio_writeread(pc, BCMA_CORE_PCI_MDIO_BLK1,

					 BCMA_CORE_PCI_MDIO_BLK1_MGMT3, data);

	} else if (pc->core->id.rev >= 21 && pc->core->id.rev <= 22) {

		data = up ? 0x75 : 0x7D;

		bcma_pcie_mdio_writeread(pc, BCMA_CORE_PCI_MDIO_BLK1,

					 BCMA_CORE_PCI_MDIO_BLK1_MGMT1, 0x7E65);

		bcma_pcie_mdio_writeread(pc, BCMA_CORE_PCI_MDIO_BLK1,

					 BCMA_CORE_PCI_MDIO_BLK1_MGMT3, data);

	}

}



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

 * Init.

 **************************************************/
@@ -262,7 +288,7 @@ int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc, struct bcma_device *core, 
}

EXPORT_SYMBOL_GPL(bcma_core_pci_irq_ctl);



void bcma_core_pci_extend_L1timer(struct bcma_drv_pci *pc, bool extend)

static void bcma_core_pci_extend_L1timer(struct bcma_drv_pci *pc, bool extend)

{

	u32 w;
@@ -274,4 +300,33 @@ void bcma_core_pci_extend_L1timer(struct bcma_drv_pci *pc, bool extend) 
	bcma_pcie_write(pc, BCMA_CORE_PCI_DLLP_PMTHRESHREG, w);

	bcma_pcie_read(pc, BCMA_CORE_PCI_DLLP_PMTHRESHREG);

}

EXPORT_SYMBOL_GPL(bcma_core_pci_extend_L1timer);
 


void bcma_core_pci_up(struct bcma_bus *bus)

{

	struct bcma_drv_pci *pc;



	if (bus->hosttype != BCMA_HOSTTYPE_PCI)

		return;



	pc = &bus->drv_pci[0];



	bcma_core_pci_power_save(pc, true);



	bcma_core_pci_extend_L1timer(pc, true);

}

EXPORT_SYMBOL_GPL(bcma_core_pci_up);



void bcma_core_pci_down(struct bcma_bus *bus)

{

	struct bcma_drv_pci *pc;



	if (bus->hosttype != BCMA_HOSTTYPE_PCI)

		return;



	pc = &bus->drv_pci[0];



	bcma_core_pci_extend_L1timer(pc, false);



	bcma_core_pci_power_save(pc, false);

}

EXPORT_SYMBOL_GPL(bcma_core_pci_down);

drivers/bcma/driver_pci_host.c

+6 −0
Original line number Diff line number Diff line
@@ -581,6 +581,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, bcma_core_pci_fixup_addresses); 
int bcma_core_pci_plat_dev_init(struct pci_dev *dev)

{

	struct bcma_drv_pci_host *pc_host;

	int readrq;



	if (dev->bus->ops->read != bcma_core_pci_hostmode_read_config) {

		/* This is not a device on the PCI-core bridge. */
@@ -595,6 +596,11 @@ int bcma_core_pci_plat_dev_init(struct pci_dev *dev) 
	dev->irq = bcma_core_irq(pc_host->pdev->core);

	pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);



	readrq = pcie_get_readrq(dev);

	if (readrq > 128) {

		pr_info("change PCIe max read request size from %i to 128\n", readrq);

		pcie_set_readrq(dev, 128);

	}

	return 0;

}

EXPORT_SYMBOL(bcma_core_pci_plat_dev_init);

drivers/bluetooth/btmrvl_debugfs.c

+3 −3
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static ssize_t btmrvl_hscfgcmd_write(struct file *file, 
	if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))

		return -EFAULT;



	ret = strict_strtol(buf, 10, &result);

	ret = kstrtol(buf, 10, &result);

	if (ret)

		return ret;
@@ -89,7 +89,7 @@ static ssize_t btmrvl_pscmd_write(struct file *file, const char __user *ubuf, 
	if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))

		return -EFAULT;



	ret = strict_strtol(buf, 10, &result);

	ret = kstrtol(buf, 10, &result);

	if (ret)

		return ret;
@@ -135,7 +135,7 @@ static ssize_t btmrvl_hscmd_write(struct file *file, const char __user *ubuf, 
	if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))

		return -EFAULT;



	ret = strict_strtol(buf, 10, &result);

	ret = kstrtol(buf, 10, &result);

	if (ret)

		return ret;