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

Commit ba6e5eb1 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 f3116f62 a508a6ea

MAINTAINERS

+18 −7
Original line number Diff line number Diff line
@@ -1230,7 +1230,7 @@ F: Documentation/aoe/ 
F:	drivers/block/aoe/



ATHEROS ATH GENERIC UTILITIES

M:	"Luis R. Rodriguez" <lrodriguez@atheros.com>

M:	"Luis R. Rodriguez" <mcgrof@qca.qualcomm.com>

L:	linux-wireless@vger.kernel.org

S:	Supported

F:	drivers/net/wireless/ath/*
@@ -1238,7 +1238,7 @@ F: drivers/net/wireless/ath/* 
ATHEROS ATH5K WIRELESS DRIVER

M:	Jiri Slaby <jirislaby@gmail.com>

M:	Nick Kossifidis <mickflemm@gmail.com>

M:	"Luis R. Rodriguez" <lrodriguez@atheros.com>

M:	"Luis R. Rodriguez" <mcgrof@qca.qualcomm.com>

M:	Bob Copeland <me@bobcopeland.com>

L:	linux-wireless@vger.kernel.org

L:	ath5k-devel@lists.ath5k.org
@@ -1247,10 +1247,10 @@ S: Maintained 
F:	drivers/net/wireless/ath/ath5k/



ATHEROS ATH9K WIRELESS DRIVER

M:	"Luis R. Rodriguez" <lrodriguez@atheros.com>

M:	Jouni Malinen <jmalinen@atheros.com>

M:	Vasanthakumar Thiagarajan <vasanth@atheros.com>

M:	Senthil Balasubramanian <senthilkumar@atheros.com>

M:	"Luis R. Rodriguez" <mcgrof@qca.qualcomm.com>

M:	Jouni Malinen <jouni@qca.qualcomm.com>

M:	Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>

M:	Senthil Balasubramanian <senthilb@qca.qualcomm.com>

L:	linux-wireless@vger.kernel.org

L:	ath9k-devel@lists.ath9k.org

W:	http://wireless.kernel.org/en/users/Drivers/ath9k
@@ -1278,7 +1278,7 @@ F: drivers/input/misc/ati_remote2.c 
ATLX ETHERNET DRIVERS

M:	Jay Cliburn <jcliburn@gmail.com>

M:	Chris Snook <chris.snook@gmail.com>

M:	Jie Yang <jie.yang@atheros.com>

M:	Jie Yang <yangjie@qca.qualcomm.com>

L:	netdev@vger.kernel.org

W:	http://sourceforge.net/projects/atl1

W:	http://atl1.sourceforge.net
@@ -4503,6 +4503,17 @@ W: http://www.qlogic.com 
S:	Supported

F:	drivers/net/ethernet/qlogic/netxen/



NFC SUBSYSTEM

M:	Lauro Ramos Venancio <lauro.venancio@openbossa.org>

M:	Aloisio Almeida Jr <aloisio.almeida@openbossa.org>

M:	Samuel Ortiz <sameo@linux.intel.com>

L:	linux-wireless@vger.kernel.org

S:	Maintained

F:	net/nfc/

F:	include/linux/nfc.h

F:	include/net/nfc.h

F:	drivers/nfc/



NFS, SUNRPC, AND LOCKD CLIENTS

M:	Trond Myklebust <Trond.Myklebust@netapp.com>

L:	linux-nfs@vger.kernel.org

drivers/bcma/driver_chipcommon_pmu.c

+19 −1
Original line number Diff line number Diff line
@@ -90,6 +90,24 @@ void bcma_pmu_swreg_init(struct bcma_drv_cc *cc) 
	}

}



/* Disable to allow reading SPROM. Don't know the adventages of enabling it. */

void bcma_chipco_bcm4331_ext_pa_lines_ctl(struct bcma_drv_cc *cc, bool enable)

{

	struct bcma_bus *bus = cc->core->bus;

	u32 val;



	val = bcma_cc_read32(cc, BCMA_CC_CHIPCTL);

	if (enable) {

		val |= BCMA_CHIPCTL_4331_EXTPA_EN;

		if (bus->chipinfo.pkg == 9 || bus->chipinfo.pkg == 11)

			val |= BCMA_CHIPCTL_4331_EXTPA_ON_GPIO2_5;

	} else {

		val &= ~BCMA_CHIPCTL_4331_EXTPA_EN;

		val &= ~BCMA_CHIPCTL_4331_EXTPA_ON_GPIO2_5;

	}

	bcma_cc_write32(cc, BCMA_CC_CHIPCTL, val);

}



void bcma_pmu_workarounds(struct bcma_drv_cc *cc)

{

	struct bcma_bus *bus = cc->core->bus;
@@ -99,7 +117,7 @@ void bcma_pmu_workarounds(struct bcma_drv_cc *cc) 
		bcma_chipco_chipctl_maskset(cc, 0, ~0, 0x7);

		break;

	case 0x4331:

		pr_err("Enabling Ext PA lines not implemented\n");

		/* BCM4331 workaround is SPROM-related, we put it in sprom.c */

		break;

	case 43224:

		if (bus->chipinfo.rev == 0) {

drivers/bcma/scan.c

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ static int bcma_get_next_core(struct bcma_bus *bus, u32 __iomem **eromptr, 


	/* get & parse master ports */

	for (i = 0; i < ports[0]; i++) {

		u32 mst_port_d = bcma_erom_get_mst_port(bus, eromptr);

		s32 mst_port_d = bcma_erom_get_mst_port(bus, eromptr);

		if (mst_port_d < 0)

			return -EILSEQ;

	}

drivers/bcma/sprom.c

+6 −0
Original line number Diff line number Diff line
@@ -152,6 +152,9 @@ int bcma_sprom_get(struct bcma_bus *bus) 
	if (!sprom)

		return -ENOMEM;



	if (bus->chipinfo.id == 0x4331)

		bcma_chipco_bcm4331_ext_pa_lines_ctl(&bus->drv_cc, false);



	/* Most cards have SPROM moved by additional offset 0x30 (48 dwords).

	 * According to brcm80211 this applies to cards with PCIe rev >= 6

	 * TODO: understand this condition and use it */
@@ -159,6 +162,9 @@ int bcma_sprom_get(struct bcma_bus *bus) 
		BCMA_CC_SPROM_PCIE6;

	bcma_sprom_read(bus, offset, sprom);



	if (bus->chipinfo.id == 0x4331)

		bcma_chipco_bcm4331_ext_pa_lines_ctl(&bus->drv_cc, true);



	err = bcma_sprom_valid(sprom);

	if (err)

		goto out;

drivers/net/wireless/ath/ath9k/ar9002_hw.c

+2 −6
Original line number Diff line number Diff line
@@ -303,17 +303,13 @@ static void ar9002_hw_init_mode_gain_regs(struct ath_hw *ah) 
 * register as the other analog registers.  Hence the 9 writes.

 */

static void ar9002_hw_configpcipowersave(struct ath_hw *ah,

					 int restore,

					 int power_off)

					 bool power_off)

{

	u8 i;

	u32 val;



	if (ah->is_pciexpress != true || ah->aspm_enabled != true)

		return;



	/* Nothing to do on restore for 11N */

	if (!restore) {

	if (!power_off /* !restore */) {

		if (AR_SREV_9280_20_OR_LATER(ah)) {

			/*

			 * AR9280 2.0 or later chips use SerDes values from the