4.19 mt76

arch/arm/configs/mt7623n_evb_fwu_defconfig

@@ -663,3 +663,5 @@ CONFIG_COMMON_CLK_MT2701_IMGSYS=y
 CONFIG_COMMON_CLK_MT2701_VDECSYS=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_DRM_FBDEV_EMULATION=y
+
+CONFIG_MT76x2E=m

drivers/net/wireless/mediatek/Kconfig

@@ -11,5 +11,6 @@ config WLAN_VENDOR_MEDIATEK
 
 if WLAN_VENDOR_MEDIATEK
 source "drivers/net/wireless/mediatek/mt7601u/Kconfig"
-source "drivers/net/wireless/mediatek/mt76/Kconfig"
+#source "drivers/net/wireless/mediatek/mt76/Kconfig"
+source "drivers/net/wireless/mediatek/mt76_new/Kconfig"
 endif # WLAN_VENDOR_MEDIATEK

drivers/net/wireless/mediatek/Makefile

@@ -1,2 +1,3 @@
 obj-$(CONFIG_MT7601U)	+= mt7601u/
-obj-$(CONFIG_MT76_CORE)	+= mt76/
+#obj-$(CONFIG_MT76_CORE)	+= mt76/
+obj-$(CONFIG_MT76_CORE)	+= mt76_new/

drivers/net/wireless/mediatek/mt76_new/Kconfig

@@ -0,0 +1,64 @@
+config MT76_CORE
+	tristate
+
+config MT76_LEDS
+	bool
+	depends on MT76_CORE
+	depends on LEDS_CLASS=y || MT76_CORE=LEDS_CLASS
+	default y
+
+config MT76_USB
+	tristate
+	depends on MT76_CORE
+
+config MT76x02_LIB
+	tristate
+	depends on MT76_CORE
+
+config MT76x0_COMMON
+	tristate
+	depends on MT76_CORE
+	select MT76x02_LIB
+
+config MT76x2_COMMON
+	tristate
+	depends on MT76_CORE
+	select MT76x02_LIB
+
+config MT76x02_USB
+	tristate "MediaTek MT76x02 (USB) support"
+	select MT76_CORE
+	select MT76x0_COMMON
+	select MT76x2_COMMON
+	depends on MAC80211
+	depends on USB
+	help
+	  This adds support for MT7610U/MT7612U-based wireless USB dongles.
+
+config MT76x2E
+	tristate "MediaTek MT76x2E (PCIe) support"
+	select MT76_CORE
+	select MT76x0_COMMON
+	select MT76x2_COMMON
+	depends on MAC80211
+	depends on PCI
+	---help---
+	  This adds support for MT7612/MT7602/MT7662-based wireless PCIe devices.
+
+config MT7603E
+	tristate "MediaTek MT7603E (PCIe) support"
+	select MT76_CORE
+	depends on MAC80211
+	depends on PCI
+	---help---
+	  This adds support for MT7603-based wireless PCIe devices.
+
+config MT76x2U
+	tristate "MediaTek MT76x2U (USB) support"
+	select MT76_CORE
+	select MT76_USB
+	select MT76x2_COMMON
+	depends on MAC80211
+	depends on USB
+	help
+	  This adds support for MT7612U-based wireless USB dongles.

drivers/net/wireless/mediatek/mt76_new/Makefile

@@ -0,0 +1,24 @@
+EXTRA_CFLAGS += -Werror -DCONFIG_MT76_LEDS
+
+obj-m := mt76.o
+obj-$(CONFIG_MT7603E) += mt7603/
+obj-$(CONFIG_MT76x02_LIB) += mt76x02-lib.o
+obj-$(CONFIG_MT76x02_USB) += mt76x02-usb.o
+obj-$(CONFIG_MT76_USB) += mt76-usb.o
+obj-$(CONFIG_MT76x2_COMMON) += mt76x2/
+obj-$(CONFIG_MT76x0_COMMON) += mt76x0/
+
+CFLAGS_trace.o := -I$(src)
+CFLAGS_mt76x02_trace.o := -I$(src)
+
+mt76-y := \
+	mmio.o util.o trace.o dma.o mac80211.o debugfs.o eeprom.o tx.o agg-rx.o
+
+mt76-usb-y := usb.o usb_trace.o usb_mcu.o
+
+mt76x02-lib-y := mt76x02_util.o mt76x02_mac.o mt76x02_mcu.o \
+		 mt76x02_eeprom.o mt76x02_phy.o mt76x02_mmio.o \
+		 mt76x02_txrx.o mt76x02_trace.o mt76x02_debugfs.o \
+		 mt76x02_dfs.o
+
+mt76x02-usb-y := mt76x02_usb_mcu.o mt76x02_usb_core.o