Commit 9c5d94bc authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next 



Kalle Valo says:

====================
pull-request: wireless-drivers-next 2015-01-22

now a bigger pull request for net-next. Rafal found a UTF-8 bug in
patchwork[1] and because of that two commits (d0c102f7 and
d0f66df5) have his name corrupted:

    Acked-by: default avatarRafa? Mi?ecki <zajec5@gmail.com>

Somehow I failed to spot that when I commited the patches. As rebasing
public git trees is bad, I thought we can live with these and decided
not to rebase. But I'll pay close attention to this in the future to
make sure that it won't happen again. Also we requested an update to
patchwork.kernel.org, the latest patchwork doesn't seem to have this
bug.

Also please note this pull request also adds one DT binding doc, but
this was reviewed in the device tree list:

 .../bindings/net/wireless/qcom,ath10k.txt          |   30 +

Please let me know if you have any issues.

[1] https://lists.ozlabs.org/pipermail/patchwork/2015-January/001261.html


====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents fd3e646c c5ed1df7

Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt

0 → 100644
+30 −0
Original line number Diff line number Diff line 
* Qualcomm Atheros ath10k wireless devices



For ath10k devices the calibration data can be provided through Device

Tree. The node is a child node of the PCI controller.



Required properties:

-compatible : Should be "qcom,ath10k"



Optional properties:

- qcom,ath10k-calibration-data : calibration data as an array, the

				 length can vary between hw versions





Example:



pci {

	pcie@0 {

		reg = <0 0 0 0 0>;

		#interrupt-cells = <1>;

		#size-cells = <2>;

		#address-cells = <3>;

		device_type = "pci";



		ath10k@0,0 {

			reg = <0 0 0 0 0>;

			device_type = "pci";

			qcom,ath10k-calibration-data = [ 01 02 03 ... ];

		};

	};

};

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -1657,7 +1657,6 @@ M: Jiri Slaby <jirislaby@gmail.com> 
M:	Nick Kossifidis <mickflemm@gmail.com>

M:	"Luis R. Rodriguez" <mcgrof@do-not-panic.com>

L:	linux-wireless@vger.kernel.org

L:	ath5k-devel@lists.ath5k.org

W:	http://wireless.kernel.org/en/users/Drivers/ath5k

S:	Maintained

F:	drivers/net/wireless/ath/ath5k/

drivers/bcma/bcma_private.h

+3 −7
Original line number Diff line number Diff line
@@ -25,22 +25,18 @@ struct bcma_bus; 
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);

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,

				   struct bcma_device *core_cc,

				   struct bcma_device *core_mips);

int __init bcma_bus_early_register(struct bcma_bus *bus);

#ifdef CONFIG_PM

int bcma_bus_suspend(struct bcma_bus *bus);

int bcma_bus_resume(struct bcma_bus *bus);

#endif



/* scan.c */

void bcma_detect_chip(struct bcma_bus *bus);

int bcma_bus_scan(struct bcma_bus *bus);

int __init bcma_bus_scan_early(struct bcma_bus *bus,

			       struct bcma_device_id *match,

			       struct bcma_device *core);

void bcma_init_bus(struct bcma_bus *bus);



/* sprom.c */

int bcma_sprom_get(struct bcma_bus *bus);

drivers/bcma/driver_chipcommon.c

+7 −3
Original line number Diff line number Diff line
@@ -79,7 +79,9 @@ static int bcma_chipco_watchdog_ticks_per_ms(struct bcma_drv_cc *cc) 


	if (cc->capabilities & BCMA_CC_CAP_PMU) {

		if (bus->chipinfo.id == BCMA_CHIP_ID_BCM4706)

			/* 4706 CC and PMU watchdogs are clocked at 1/4 of ALP clock */

			/* 4706 CC and PMU watchdogs are clocked at 1/4 of ALP

			 * clock

			 */

			return bcma_chipco_get_alp_clock(cc) / 4000;

		else

			/* based on 32KHz ILP clock */
@@ -97,7 +99,8 @@ int bcma_chipco_watchdog_register(struct bcma_drv_cc *cc) 
	wdt.driver_data = cc;

	wdt.timer_set = bcma_chipco_watchdog_timer_set_wdt;

	wdt.timer_set_ms = bcma_chipco_watchdog_timer_set_ms_wdt;

	wdt.max_timer_ms = bcma_chipco_watchdog_get_max_timer(cc) / cc->ticks_per_ms;

	wdt.max_timer_ms =

		bcma_chipco_watchdog_get_max_timer(cc) / cc->ticks_per_ms;



	pdev = platform_device_register_data(NULL, "bcm47xx-wdt",

					     cc->core->bus->num, &wdt,
@@ -335,7 +338,8 @@ void bcma_chipco_serial_init(struct bcma_drv_cc *cc) 
				       | BCMA_CC_CORECTL_UARTCLKEN);

		}

	} else {

		bcma_err(cc->core->bus, "serial not supported on this device ccrev: 0x%x\n", ccrev);

		bcma_err(cc->core->bus, "serial not supported on this device ccrev: 0x%x\n",

			 ccrev);

		return;

	}

drivers/bcma/host_soc.c

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ int __init bcma_host_soc_init(struct bcma_soc *soc) 
	int err;



	/* Scan bus and initialize it */

	err = bcma_bus_early_register(bus, &soc->core_cc, &soc->core_mips);

	err = bcma_bus_early_register(bus);

	if (err)

		iounmap(bus->mmio);

CRA Git | Maintained and supported by SUSTech CRA and CCSE