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

Merge tag 'wireless-drivers-next-2020-03-05' of... 

Merge tag 'wireless-drivers-next-2020-03-05' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next



Kalle Valo says:

====================
wireless-drivers-next patches for v5.7

First set of patches for v5.7. Lots of mt76 patches as they missed the
v5.6 deadline and hence they were postponed to the next version.
Otherwise nothing special standing out.

mt76

Major changes:

* dual-band concurrent support for MT7615

* fixes for rx path race conditions

* coverage class support for MT7615

* beacon fixes for USB devices

* MT7615 LED support

* set_antenna support for MT7615

* tracing improvements

* preparation for supporting new USB devices

* tx power fixes

brcmfmac

* support BRCM 4364 found in MacBook Pro 15,2
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 442a46ad 6065bb8a

Documentation/devicetree/bindings/net/wireless/mediatek,mt76.txt

+26 −3
Original line number Diff line number Diff line
@@ -4,17 +4,27 @@ This node provides properties for configuring the MediaTek mt76xx wireless 
device. The node is expected to be specified as a child node of the PCI

controller to which the wireless chip is connected.



Alternatively, it can specify the wireless part of the MT7628/MT7688 SoC.

For SoC, use the compatible string "mediatek,mt7628-wmac" and the following

properties:

Alternatively, it can specify the wireless part of the MT7628/MT7688 or

MT7622 SoC. For SoC, use the following compatible strings:



compatible:

- "mediatek,mt7628-wmac" for MT7628/MT7688

- "mediatek,mt7622-wmac" for MT7622



properties:

- reg: Address and length of the register set for the device.

- interrupts: Main device interrupt



MT7622 specific properties:

- power-domains: phandle to the power domain that the WMAC is part of

- mediatek,infracfg: phandle to the infrastructure bus fabric syscon node



Optional properties:



- ieee80211-freq-limit: See ieee80211.txt

- mediatek,mtd-eeprom: Specify a MTD partition + offset containing EEPROM data

- big-endian: if the radio eeprom partition is written in big-endian, specify

  this property



The MAC address can as well be set with corresponding optional properties

defined in net/ethernet.txt.
@@ -31,6 +41,7 @@ Optional nodes: 
			reg = <0x0000 0 0 0 0>;

			ieee80211-freq-limit = <5000000 6000000>;

			mediatek,mtd-eeprom = <&factory 0x8000>;

			big-endian;



			led {

				led-sources = <2>;
@@ -50,3 +61,15 @@ wmac: wmac@10300000 { 


	mediatek,mtd-eeprom = <&factory 0x0000>;

};



MT7622 example:



wmac: wmac@18000000 {

	compatible = "mediatek,mt7622-wmac";

	reg = <0 0x18000000 0 0x100000>;

	interrupts = <GIC_SPI 211 IRQ_TYPE_LEVEL_LOW>;



	mediatek,infracfg = <&infracfg>;



	power-domains = <&scpsys MT7622_POWER_DOMAIN_WB>;

};

Documentation/devicetree/bindings/net/wireless/ti,wl1251.txt

+2 −1
Original line number Diff line number Diff line
@@ -9,11 +9,12 @@ Required properties: 
- spi-max-frequency : Maximum SPI clocking speed of device in Hz

- interrupts :        Should contain interrupt line

- vio-supply :        phandle to regulator providing VIO

- ti,power-gpio :     GPIO connected to chip's PMEN pin



Optional properties:

- ti,wl1251-has-eeprom : boolean, the wl1251 has an eeprom connected, which

                         provides configuration data (calibration, MAC, ...)

- ti,power-gpio :	 GPIO connected to chip's PMEN pin if operated in

			 SPI mode

- Please consult Documentation/devicetree/bindings/spi/spi-bus.txt

  for optional SPI connection related properties,

drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c

+1 −0
Original line number Diff line number Diff line
@@ -723,6 +723,7 @@ static u32 brcmf_chip_tcm_rambase(struct brcmf_chip_priv *ci) 
		return 0x200000;

	case BRCM_CC_4359_CHIP_ID:

		return (ci->pub.chiprev < 9) ? 0x180000 : 0x160000;

	case BRCM_CC_4364_CHIP_ID:

	case CY_CC_4373_CHIP_ID:

		return 0x160000;

	default:

drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c

+3 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ BRCMF_FW_DEF(4356, "brcmfmac4356-pcie"); 
BRCMF_FW_DEF(43570, "brcmfmac43570-pcie");

BRCMF_FW_DEF(4358, "brcmfmac4358-pcie");

BRCMF_FW_DEF(4359, "brcmfmac4359-pcie");

BRCMF_FW_DEF(4364, "brcmfmac4364-pcie");

BRCMF_FW_DEF(4365B, "brcmfmac4365b-pcie");

BRCMF_FW_DEF(4365C, "brcmfmac4365c-pcie");

BRCMF_FW_DEF(4366B, "brcmfmac4366b-pcie");
@@ -70,6 +71,7 @@ static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = { 
	BRCMF_FW_ENTRY(BRCM_CC_43570_CHIP_ID, 0xFFFFFFFF, 43570),

	BRCMF_FW_ENTRY(BRCM_CC_4358_CHIP_ID, 0xFFFFFFFF, 4358),

	BRCMF_FW_ENTRY(BRCM_CC_4359_CHIP_ID, 0xFFFFFFFF, 4359),

	BRCMF_FW_ENTRY(BRCM_CC_4364_CHIP_ID, 0xFFFFFFFF, 4364),

	BRCMF_FW_ENTRY(BRCM_CC_4365_CHIP_ID, 0x0000000F, 4365B),

	BRCMF_FW_ENTRY(BRCM_CC_4365_CHIP_ID, 0xFFFFFFF0, 4365C),

	BRCMF_FW_ENTRY(BRCM_CC_4366_CHIP_ID, 0x0000000F, 4366B),
@@ -2105,6 +2107,7 @@ static const struct pci_device_id brcmf_pcie_devid_table[] = { 
	BRCMF_PCIE_DEVICE(BRCM_PCIE_43602_2G_DEVICE_ID),

	BRCMF_PCIE_DEVICE(BRCM_PCIE_43602_5G_DEVICE_ID),

	BRCMF_PCIE_DEVICE(BRCM_PCIE_43602_RAW_DEVICE_ID),

	BRCMF_PCIE_DEVICE(BRCM_PCIE_4364_DEVICE_ID),

	BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_DEVICE_ID),

	BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_2G_DEVICE_ID),

	BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_5G_DEVICE_ID),

drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c

+2 −0
Original line number Diff line number Diff line
@@ -1938,6 +1938,8 @@ static uint brcmf_sdio_readframes(struct brcmf_sdio *bus, uint maxframes) 
			if (brcmf_sdio_hdparse(bus, bus->rxhdr, &rd_new,

					       BRCMF_SDIO_FT_NORMAL)) {

				rd->len = 0;

				brcmf_sdio_rxfail(bus, true, true);

				sdio_release_host(bus->sdiodev->func1);

				brcmu_pkt_buf_free_skb(pkt);

				continue;

			}

CRA Git | Maintained and supported by SUSTech CRA and CCSE