Commit 0b366069 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-next-2022-03-11' of... 

Merge tag 'wireless-next-2022-03-11' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next

Johannes Berg says:

====================
brcmfmac
 * add BCM43454/6 support

rtw89
 * add support for 160 MHz channels and 6 GHz band
 * hardware scan support

iwlwifi
 * support UHB TAS enablement via BIOS
 * remove a bunch of W=1 warnings
 * add support for channel switch offload
 * support 32 Rx AMPDU sessions in newer devices
 * add support for a couple of new devices
 * add support for band disablement via BIOS

mt76
 * mt7915 thermal management improvements
 * SAR support for more mt76 drivers
 * mt7986 wmac support on mt7915

ath11k
 * debugfs interface to configure firmware debug log level
 * debugfs interface to test Target Wake Time (TWT)
 * provide 802.11ax High Efficiency (HE) data via radiotap

ath9k
 * use hw_random API instead of directly dumping into random.c

wcn36xx
 * fix wcn3660 to work on 5 GHz band

ath6kl
 * add device ID for WLU5150-D81

cfg80211/mac80211
 * initial EHT (from 802.11be) support
   (EHT rates, 320 MHz, larger block-ack)
 * support disconnect on HW restart

* tag 'wireless-next-2022-03-11' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next: (247 commits)
  mac80211: Add support to trigger sta disconnect on hardware restart
  mac80211: fix potential double free on mesh join
  mac80211: correct legacy rates check in ieee80211_calc_rx_airtime
  nl80211: fix typo of NL80211_IF_TYPE_OCB in documentation
  mac80211: Use GFP_KERNEL instead of GFP_ATOMIC when possible
  mac80211: replace DEFINE_SIMPLE_ATTRIBUTE with DEFINE_DEBUGFS_ATTRIBUTE
  rtw89: 8852c: process logic efuse map
  rtw89: 8852c: process efuse of phycap
  rtw89: support DAV efuse reading operation
  rtw89: 8852c: add chip::dle_mem
  rtw89: add page_regs to handle v1 chips
  rtw89: add chip_info::{h2c,c2h}_reg to support more chips
  rtw89: add hci_func_en_addr to support variant generation
  rtw89: add power_{on/off}_func
  rtw89: read chip version depends on chip ID
  rtw89: pci: use a struct to describe all registers address related to DMA channel
  rtw89: pci: add V1 of PCI channel address
  rtw89: pci: add struct rtw89_pci_info
  rtw89: 8852c: add 8852c empty files
  MAINTAINERS: add devicetree bindings entry for mt76
  ...

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

Link: https://lore.kernel.org/r/20220311124029.213470-1-johannes@sipsolutions.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 59d59235 7d352ccf

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

+30 −3
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ description: | 
  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

  or MT7622 SoC.

  or MT7622/MT7986 SoC.



allOf:

  - $ref: ieee80211.yaml#
@@ -29,9 +29,13 @@ properties: 
      - mediatek,mt76

      - mediatek,mt7628-wmac

      - mediatek,mt7622-wmac

      - mediatek,mt7986-wmac



  reg:

    maxItems: 1

    minItems: 1

    maxItems: 3

    description:

      MT7986 should contain 3 regions consys, dcm, and sku, in this order.



  interrupts:

    maxItems: 1
@@ -39,6 +43,17 @@ properties: 
  power-domains:

    maxItems: 1



  memory-region:

    maxItems: 1



  resets:

    maxItems: 1

    description:

      Specify the consys reset for mt7986.



  reset-name:

    const: consys



  mediatek,infracfg:

    $ref: /schemas/types.yaml#/definitions/phandle

    description:
@@ -174,7 +189,7 @@ required: 
  - compatible

  - reg



additionalProperties: false

unevaluatedProperties: false



examples:

  - |
@@ -240,3 +255,15 @@ examples: 


      power-domains = <&scpsys 3>;

    };



  - |

    wifi@18000000 {

        compatible = "mediatek,mt7986-wmac";

        resets = <&watchdog 23>;

        reset-names = "consys";

        reg = <0x18000000 0x1000000>,

              <0x10003000 0x1000>,

              <0x11d10000 0x1000>;

        interrupts = <GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH>;

        memory-region = <&wmcpu_emi>;

    };

MAINTAINERS

+1 −3
Original line number Diff line number Diff line
@@ -3821,9 +3821,6 @@ BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER 
M:	Arend van Spriel <aspriel@gmail.com>

M:	Franky Lin <franky.lin@broadcom.com>

M:	Hante Meuleman <hante.meuleman@broadcom.com>

M:	Chi-hsien Lin <chi-hsien.lin@infineon.com>

M:	Wright Feng <wright.feng@infineon.com>

M:	Chung-hsien Hsu <chung-hsien.hsu@infineon.com>

L:	linux-wireless@vger.kernel.org

L:	brcm80211-dev-list.pdl@broadcom.com

L:	SHA-cyfmac-dev-list@infineon.com
@@ -12173,6 +12170,7 @@ R: Shayne Chen <shayne.chen@mediatek.com> 
R:	Sean Wang <sean.wang@mediatek.com>

L:	linux-wireless@vger.kernel.org

S:	Maintained

F:	Documentation/devicetree/bindings/net/wireless/mediatek,mt76.yaml

F:	drivers/net/wireless/mediatek/mt76/









MEDIATEK MT7601U WIRELESS LAN DRIVER
































drivers/bcma/driver_chipcommon.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -303,7 +303,7 @@ u32 bcma_chipco_gpio_outen(struct bcma_drv_cc *cc, u32 mask, u32 value)







EXPORT_SYMBOL_GPL(bcma_chipco_gpio_outen);



















/*









 * If the bit is set to 0, chipcommon controlls this GPIO,









 * If the bit is set to 0, chipcommon controls this GPIO,









 * if the bit is set to 1, it is used by some part of the chip and not our code.









 */









u32 bcma_chipco_gpio_control(struct bcma_drv_cc *cc, u32 mask, u32 value)
































drivers/bcma/driver_chipcommon_pmu.c



+3
−3






























Original line number
Diff line number
Diff line







@@ -206,7 +206,7 @@ static void bcma_pmu_resources_init(struct bcma_drv_cc *cc)







	usleep_range(2000, 2500);









}



















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









/* Disable to allow reading SPROM. Don't know the advantages 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;








@@ -234,7 +234,7 @@ static void bcma_pmu_workarounds(struct bcma_drv_cc *cc)







	switch (bus->chipinfo.id) {









	case BCMA_CHIP_ID_BCM4313:









		/*









		 * enable 12 mA drive strenth for 4313 and set chipControl









		 * enable 12 mA drive strength for 4313 and set chipControl









		 * register bit 1









		 */









		bcma_chipco_chipctl_maskset(cc, 0,








@@ -249,7 +249,7 @@ static void bcma_pmu_workarounds(struct bcma_drv_cc *cc)







	case BCMA_CHIP_ID_BCM43224:









	case BCMA_CHIP_ID_BCM43421:









		/*









		 * enable 12 mA drive strenth for 43224 and set chipControl









		 * enable 12 mA drive strength for 43224 and set chipControl









		 * register bit 15









		 */









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
































drivers/bcma/driver_gpio.c



+0
−1






























Original line number
Diff line number
Diff line







@@ -181,7 +181,6 @@ int bcma_gpio_init(struct bcma_drv_cc *cc)







	chip->set		= bcma_gpio_set_value;









	chip->direction_input	= bcma_gpio_direction_input;









	chip->direction_output	= bcma_gpio_direction_output;









	chip->owner		= THIS_MODULE;









	chip->parent		= bus->dev;









#if IS_BUILTIN(CONFIG_OF)









	chip->of_node		= cc->core->dev.of_node;