Merge remote branch 'wireless-next/master' into ath6kl-next (f3674ee9) · Commits · 戴 / test

MAINTAINERS

+9 −7

Original line number	Diff line number	Diff line
		@@ -1246,6 +1246,14 @@ W: http://wireless.kernel.org/en/users/Drivers/ath5k
		S: Maintained
		F: drivers/net/wireless/ath/ath5k/

		ATHEROS ATH6KL WIRELESS DRIVER
		M: Kalle Valo <kvalo@qca.qualcomm.com>
		L: linux-wireless@vger.kernel.org
		W: http://wireless.kernel.org/en/users/Drivers/ath6kl
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath6kl.git
		S: Supported
		F: drivers/net/wireless/ath/ath6kl/

		ATHEROS ATH9K WIRELESS DRIVER
		M: "Luis R. Rodriguez" <mcgrof@qca.qualcomm.com>
		M: Jouni Malinen <jouni@qca.qualcomm.com>
		@@ -4500,7 +4508,7 @@ L: linux-wireless@vger.kernel.org
		S: Maintained
		F: net/nfc/
		F: include/linux/nfc.h
		F: include/net/nfc.h
		F: include/net/nfc/
		F: drivers/nfc/

		NFS, SUNRPC, AND LOCKD CLIENTS
		@@ -6122,12 +6130,6 @@ M: Jakub Schmidtke <sjakub@gmail.com>
		S: Odd Fixes
		F: drivers/staging/asus_oled/

		STAGING - ATHEROS ATH6KL WIRELESS DRIVER
		M: Luis R. Rodriguez <mcgrof@gmail.com>
		M: Naveen Singh <nsingh@atheros.com>
		S: Odd Fixes
		F: drivers/staging/ath6kl/

		STAGING - COMEDI
		M: Ian Abbott <abbotti@mev.co.uk>
		M: Mori Hess <fmhess@users.sourceforge.net>

drivers/bcma/driver_chipcommon_pmu.c

+29 −9

Original line number	Diff line number	Diff line
		@@ -18,20 +18,40 @@ static u32 bcma_chipco_pll_read(struct bcma_drv_cc *cc, u32 offset)
		return bcma_cc_read32(cc, BCMA_CC_PLLCTL_DATA);
		}

		static void bcma_chipco_chipctl_maskset(struct bcma_drv_cc *cc,
		u32 offset, u32 mask, u32 set)
		void bcma_chipco_pll_write(struct bcma_drv_cc *cc, u32 offset, u32 value)
		{
		u32 value;
		bcma_cc_write32(cc, BCMA_CC_PLLCTL_ADDR, offset);
		bcma_cc_read32(cc, BCMA_CC_PLLCTL_ADDR);
		bcma_cc_write32(cc, BCMA_CC_PLLCTL_DATA, value);
		}
		EXPORT_SYMBOL_GPL(bcma_chipco_pll_write);

		bcma_cc_read32(cc, BCMA_CC_CHIPCTL_ADDR);
		void bcma_chipco_pll_maskset(struct bcma_drv_cc *cc, u32 offset, u32 mask,
		u32 set)
		{
		bcma_cc_write32(cc, BCMA_CC_PLLCTL_ADDR, offset);
		bcma_cc_read32(cc, BCMA_CC_PLLCTL_ADDR);
		bcma_cc_maskset32(cc, BCMA_CC_PLLCTL_DATA, mask, set);
		}
		EXPORT_SYMBOL_GPL(bcma_chipco_pll_maskset);

		void bcma_chipco_chipctl_maskset(struct bcma_drv_cc *cc,
		u32 offset, u32 mask, u32 set)
		{
		bcma_cc_write32(cc, BCMA_CC_CHIPCTL_ADDR, offset);
		bcma_cc_read32(cc, BCMA_CC_CHIPCTL_ADDR);
		value = bcma_cc_read32(cc, BCMA_CC_CHIPCTL_DATA);
		value &= mask;
		value \|= set;
		bcma_cc_write32(cc, BCMA_CC_CHIPCTL_DATA, value);
		bcma_cc_read32(cc, BCMA_CC_CHIPCTL_DATA);
		bcma_cc_maskset32(cc, BCMA_CC_CHIPCTL_DATA, mask, set);
		}
		EXPORT_SYMBOL_GPL(bcma_chipco_chipctl_maskset);

		void bcma_chipco_regctl_maskset(struct bcma_drv_cc *cc, u32 offset, u32 mask,
		u32 set)
		{
		bcma_cc_write32(cc, BCMA_CC_REGCTL_ADDR, offset);
		bcma_cc_read32(cc, BCMA_CC_REGCTL_ADDR);
		bcma_cc_maskset32(cc, BCMA_CC_REGCTL_DATA, mask, set);
		}
		EXPORT_SYMBOL_GPL(bcma_chipco_regctl_maskset);

		static void bcma_pmu_pll_init(struct bcma_drv_cc *cc)
		{

drivers/bcma/main.c

+12 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@ MODULE_LICENSE("GPL");
		static int bcma_bus_match(struct device dev, struct device_driver drv);
		static int bcma_device_probe(struct device *dev);
		static int bcma_device_remove(struct device *dev);
		static int bcma_device_uevent(struct device dev, struct kobj_uevent_env env);

		static ssize_t manuf_show(struct device dev, struct device_attribute attr, char *buf)
		{
		@@ -49,6 +50,7 @@ static struct bus_type bcma_bus_type = {
		.match = bcma_bus_match,
		.probe = bcma_device_probe,
		.remove = bcma_device_remove,
		.uevent = bcma_device_uevent,
		.dev_attrs = bcma_device_attrs,
		};

		@@ -295,6 +297,16 @@ static int bcma_device_remove(struct device *dev)
		return 0;
		}

		static int bcma_device_uevent(struct device dev, struct kobj_uevent_env env)
		{
		struct bcma_device *core = container_of(dev, struct bcma_device, dev);

		return add_uevent_var(env,
		"MODALIAS=bcma:m%04Xid%04Xrev%02Xcl%02X",
		core->id.manuf, core->id.id,
		core->id.rev, core->id.class);
		}

		static int __init bcma_modinit(void)
		{
		int err;

drivers/bcma/sprom.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -133,6 +133,15 @@ static void bcma_sprom_extract_r8(struct bcma_bus bus, const u16 sprom)
		v = sprom[SPOFF(SSB_SPROM8_IL0MAC) + i];
		(((__be16 )bus->sprom.il0mac) + i) = cpu_to_be16(v);
		}

		bus->sprom.board_rev = sprom[SPOFF(SSB_SPROM8_BOARDREV)];

		bus->sprom.boardflags_lo = sprom[SPOFF(SSB_SPROM8_BFLLO)];
		bus->sprom.boardflags_hi = sprom[SPOFF(SSB_SPROM8_BFLHI)];
		bus->sprom.boardflags2_lo = sprom[SPOFF(SSB_SPROM8_BFL2LO)];
		bus->sprom.boardflags2_hi = sprom[SPOFF(SSB_SPROM8_BFL2HI)];

		bus->sprom.country_code = sprom[SPOFF(SSB_SPROM8_CCODE)];
		}

		int bcma_sprom_get(struct bcma_bus *bus)

drivers/bluetooth/ath3k.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -63,6 +63,7 @@ static struct usb_device_id ath3k_table[] = {
		/* Atheros AR3011 with sflash firmware*/
		{ USB_DEVICE(0x0CF3, 0x3002) },
		{ USB_DEVICE(0x13d3, 0x3304) },
		{ USB_DEVICE(0x0930, 0x0215) },

		/* Atheros AR9285 Malbec with sflash firmware */
		{ USB_DEVICE(0x03F0, 0x311D) },

Admin message