diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile
index f4b37989c8..3d431b30b2 100644
--- a/package/kernel/mt76/Makefile
+++ b/package/kernel/mt76/Makefile
@@ -1,16 +1,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mt76
-PKG_RELEASE=2
+PKG_RELEASE=1
 
 PKG_LICENSE:=GPLv2
 PKG_LICENSE_FILES:=
 
 PKG_SOURCE_URL:=https://github.com/openwrt/mt76
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2020-04-27
-PKG_SOURCE_VERSION:=5f3ccc7226272198c21ec934d9072a56b0953f47
-PKG_MIRROR_HASH:=6f1a7b7d7b9f4db79d72405baeafa318769eeab270fea4479756f91ac5a2494d
+PKG_SOURCE_DATE:=2020-03-10
+PKG_SOURCE_VERSION:=08054d5ab1350fcb8563feb90e6ab7f8f4a0a1b7
+PKG_MIRROR_HASH:=b41a3cab1485c68befb1dcb4c1e426d41705db1b2a57851dafd6e8f75eeea3d7
 
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_BUILD_PARALLEL:=1
@@ -143,7 +143,6 @@ define KernelPackage/mt7615e
   TITLE:=MediaTek MT7615 wireless driver
   DEPENDS+=@PCI_SUPPORT +kmod-mt76-core
   FILES:=\
-	$(PKG_BUILD_DIR)/mt7615/mt7615-common.ko \
 	$(PKG_BUILD_DIR)/mt7615/mt7615e.ko
   AUTOLOAD:=$(call AutoProbe,mt7615e)
 endef
@@ -192,12 +191,7 @@ ifdef CONFIG_PACKAGE_kmod-mt7603
   PKG_MAKE_FLAGS += CONFIG_MT7603E=m
 endif
 ifdef CONFIG_PACKAGE_kmod-mt7615e
-  PKG_MAKE_FLAGS += CONFIG_MT7615_COMMON=m
   PKG_MAKE_FLAGS += CONFIG_MT7615E=m
-  ifdef CONFIG_TARGET_mediatek_mt7622
-    PKG_MAKE_FLAGS += CONFIG_MT7622_WMAC=y
-    NOSTDINC_FLAGS += -DCONFIG_MT7622_WMAC
-  endif
 endif
 
 define Build/Compile
@@ -257,9 +251,6 @@ define KernelPackage/mt7615e/install
 		$(PKG_BUILD_DIR)/firmware/mt7615_cr4.bin \
 		$(PKG_BUILD_DIR)/firmware/mt7615_n9.bin \
 		$(PKG_BUILD_DIR)/firmware/mt7615_rom_patch.bin \
-		$(if $(CONFIG_TARGET_mediatek_mt7622), \
-			$(PKG_BUILD_DIR)/firmware/mt7622_n9.bin \
-			$(PKG_BUILD_DIR)/firmware/mt7622_rom_patch.bin) \
 		$(1)/lib/firmware/mediatek
 endef
 
diff --git a/package/kernel/mt76/patches/001-allow-vht-on-2g.patch b/package/kernel/mt76/patches/001-allow-vht-on-2g.patch
index 571574980b..53cd01b8b7 100644
--- a/package/kernel/mt76/patches/001-allow-vht-on-2g.patch
+++ b/package/kernel/mt76/patches/001-allow-vht-on-2g.patch
@@ -1,24 +1,24 @@
 --- a/mac80211.c
 +++ b/mac80211.c
-@@ -156,7 +156,7 @@ static void mt76_init_stream_cap(struct
+@@ -156,7 +156,7 @@ static void mt76_init_stream_cap(struct mt76_dev *dev,
  void mt76_set_stream_caps(struct mt76_dev *dev, bool vht)
  {
  	if (dev->cap.has_2ghz)
--		mt76_init_stream_cap(dev, &dev->phy.sband_2g.sband, false);
-+		mt76_init_stream_cap(dev, &dev->phy.sband_2g.sband, vht);
+-		mt76_init_stream_cap(dev, &dev->sband_2g.sband, false);
++		mt76_init_stream_cap(dev, &dev->sband_2g.sband, vht);
  	if (dev->cap.has_5ghz)
- 		mt76_init_stream_cap(dev, &dev->phy.sband_5g.sband, vht);
+ 		mt76_init_stream_cap(dev, &dev->sband_5g.sband, vht);
  }
-@@ -218,14 +218,14 @@ mt76_init_sband(struct mt76_dev *dev, st
+@@ -221,14 +221,14 @@ mt76_init_sband(struct mt76_dev *dev, struct mt76_sband *msband,
  
  static int
  mt76_init_sband_2g(struct mt76_dev *dev, struct ieee80211_rate *rates,
 -		   int n_rates)
 +		   int n_rates, bool vht)
  {
- 	dev->hw->wiphy->bands[NL80211_BAND_2GHZ] = &dev->phy.sband_2g.sband;
+ 	dev->hw->wiphy->bands[NL80211_BAND_2GHZ] = &dev->sband_2g.sband;
  
- 	return mt76_init_sband(dev, &dev->phy.sband_2g,
+ 	return mt76_init_sband(dev, &dev->sband_2g,
  			       mt76_channels_2ghz,
  			       ARRAY_SIZE(mt76_channels_2ghz),
 -			       rates, n_rates, false);
@@ -26,8 +26,8 @@
  }
  
  static int
-@@ -445,7 +445,7 @@ int mt76_register_device(struct mt76_dev
- 	mt76_phy_init(dev, hw);
+@@ -349,7 +349,7 @@ int mt76_register_device(struct mt76_dev *dev, bool vht,
+ 		BIT(NL80211_IFTYPE_ADHOC);
  
  	if (dev->cap.has_2ghz) {
 -		ret = mt76_init_sband_2g(dev, rates, n_rates);