mt76x2: move mt76x2 source files to mt76x2 folder

Move mt76x2 and mt76x2u drivers to mt76x2 subfolder and
leave just shared code in mt76 root folder

Acked-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

drivers/net/wireless/mediatek/mt76/Kconfig

@@ -13,44 +13,5 @@ config MT76x02_USB
 	tristate
 	select MT76_USB
 
-config MT76x0_COMMON
-	tristate
-	select MT76x02_LIB
-
-config MT76x2_COMMON
-	tristate
-	select MT76x02_LIB
-
-config MT76x0U
-	tristate "MediaTek MT76x0U (USB) support"
-	select MT76x0_COMMON
-	select MT76x02_USB
-	depends on MAC80211
-	depends on USB
-	help
-	  This adds support for MT7610U-based wireless USB dongles.
-
-config MT76x0E
-	tristate "MediaTek MT76x0E (PCIe) support"
-	select MT76x0_COMMON
-	depends on MAC80211
-	depends on PCI
-	help
-	  This adds support for MT7610/MT7630-based wireless PCIe devices.
-
-config MT76x2E
-	tristate "MediaTek MT76x2E (PCIe) support"
-	select MT76x2_COMMON
-	depends on MAC80211
-	depends on PCI
-	---help---
-	  This adds support for MT7612/MT7602/MT7662-based wireless PCIe devices.
-
-config MT76x2U
-	tristate "MediaTek MT76x2U (USB) support"
-	select MT76x2_COMMON
-	select MT76x02_USB
-	depends on MAC80211
-	depends on USB
-	help
-	  This adds support for MT7612U-based wireless USB dongles.
+source "drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig"
+source "drivers/net/wireless/mediatek/mt76/mt76x2/Kconfig"

drivers/net/wireless/mediatek/mt76/Makefile

@@ -1,11 +1,7 @@
 obj-$(CONFIG_MT76_CORE) += mt76.o
 obj-$(CONFIG_MT76_USB) += mt76-usb.o
-obj-$(CONFIG_MT76x0_COMMON) += mt76x0/
 obj-$(CONFIG_MT76x02_LIB) += mt76x02-lib.o
 obj-$(CONFIG_MT76x02_USB) += mt76x02-usb.o
-obj-$(CONFIG_MT76x2_COMMON) += mt76x2-common.o
-obj-$(CONFIG_MT76x2E) += mt76x2e.o
-obj-$(CONFIG_MT76x2U) += mt76x2u.o
 
 mt76-y := \
 	mmio.o util.o trace.o dma.o mac80211.o debugfs.o eeprom.o tx.o agg-rx.o
@@ -20,19 +16,5 @@ mt76x02-lib-y := mt76x02_util.o mt76x02_mac.o mt76x02_mcu.o \
 
 mt76x02-usb-y := mt76x02_usb_mcu.o mt76x02_usb_core.o
 
-mt76x2-common-y := \
-	mt76x2_eeprom.o mt76x2_tx_common.o mt76x2_mac_common.o \
-	mt76x2_init_common.o mt76x2_common.o mt76x2_phy_common.o \
-	mt76x2_debugfs.o mt76x2_mcu_common.o
-
-mt76x2e-y := \
-	mt76x2_pci.o mt76x2_dma.o \
-	mt76x2_main.o mt76x2_init.o mt76x2_tx.o \
-	mt76x2_core.o mt76x2_mac.o mt76x2_mcu.o mt76x2_phy.o \
-	mt76x2_dfs.o mt76x2_trace.o
-
-mt76x2u-y := \
-	mt76x2_usb.o mt76x2u_init.o mt76x2u_main.o mt76x2u_mac.o \
-	mt76x2u_mcu.o mt76x2u_phy.o mt76x2u_core.o
-
-CFLAGS_mt76x2_trace.o := -I$(src)
+obj-$(CONFIG_MT76x0_COMMON) += mt76x0/
+obj-$(CONFIG_MT76x2_COMMON) += mt76x2/

drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig

@@ -0,0 +1,20 @@
+config MT76x0_COMMON
+	tristate
+	select MT76x02_LIB
+
+config MT76x0U
+	tristate "MediaTek MT76x0U (USB) support"
+	select MT76x0_COMMON
+	select MT76x02_USB
+	depends on MAC80211
+	depends on USB
+	help
+	  This adds support for MT7610U-based wireless USB dongles.
+
+config MT76x0E
+	tristate "MediaTek MT76x0E (PCIe) support"
+	select MT76x0_COMMON
+	depends on MAC80211
+	depends on PCI
+	help
+	  This adds support for MT7610/MT7630-based wireless PCIe devices.

drivers/net/wireless/mediatek/mt76/mt76x2/Kconfig

@@ -0,0 +1,20 @@
+config MT76x2_COMMON
+	tristate
+	select MT76x02_LIB
+
+config MT76x2E
+	tristate "MediaTek MT76x2E (PCIe) support"
+	select MT76x2_COMMON
+	depends on MAC80211
+	depends on PCI
+	---help---
+	  This adds support for MT7612/MT7602/MT7662-based wireless PCIe devices.
+
+config MT76x2U
+	tristate "MediaTek MT76x2U (USB) support"
+	select MT76x2_COMMON
+	select MT76x02_USB
+	depends on MAC80211
+	depends on USB
+	help
+	  This adds support for MT7612U-based wireless USB dongles.

drivers/net/wireless/mediatek/mt76/mt76x2/Makefile

@@ -0,0 +1,18 @@
+obj-$(CONFIG_MT76x2_COMMON) += mt76x2-common.o
+obj-$(CONFIG_MT76x2E) += mt76x2e.o
+obj-$(CONFIG_MT76x2U) += mt76x2u.o
+
+mt76x2-common-y := \
+	eeprom.o tx.o mac.o init.o common.o phy.o \
+	debugfs.o mcu.o
+
+mt76x2e-y := \
+	pci.o pci_dma.o pci_main.o pci_init.o pci_tx.o \
+	pci_core.o pci_mac.o pci_mcu.o pci_phy.o \
+	pci_dfs.o pci_trace.o
+
+mt76x2u-y := \
+	usb.o usb_init.o usb_main.o usb_mac.o usb_mcu.o \
+	usb_phy.o usb_core.o
+
+CFLAGS_pci_trace.o := -I$(src)

drivers/net/wireless/mediatek/mt76/mt76x2/common.c

@@ -16,7 +16,7 @@
  */
 
 #include "mt76x2.h"
-#include "mt76x02_mac.h"
+#include "../mt76x02_mac.h"
 
 void mt76x2_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,
 			 struct sk_buff *skb)

drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c

@@ -17,7 +17,7 @@
 #include <linux/module.h>
 #include <asm/unaligned.h>
 #include "mt76x2.h"
-#include "mt76x2_eeprom.h"
+#include "eeprom.h"
 
 #define EE_FIELD(_name, _value) [MT_EE_##_name] = (_value) | 1
 

drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.h

@@ -17,7 +17,7 @@
 #ifndef __MT76x2_EEPROM_H
 #define __MT76x2_EEPROM_H
 
-#include "mt76x02_eeprom.h"
+#include "../mt76x02_eeprom.h"
 
 enum mt76x2_cal_channel_group {
 	MT_CH_5G_JAPAN,

drivers/net/wireless/mediatek/mt76/mt76x2/init.c

@@ -16,8 +16,8 @@
  */
 
 #include "mt76x2.h"
-#include "mt76x2_eeprom.h"
-#include "mt76x02_phy.h"
+#include "eeprom.h"
+#include "../mt76x02_phy.h"
 
 static void
 mt76x2_set_wlan_state(struct mt76x2_dev *dev, bool enable)

drivers/net/wireless/mediatek/mt76/mt76x2/mac.c

@@ -16,7 +16,7 @@
  */
 
 #include "mt76x2.h"
-#include "mt76x02_util.h"
+#include "../mt76x02_util.h"
 
 void mt76x2_mac_stop(struct mt76x2_dev *dev, bool force)
 {

drivers/net/wireless/mediatek/mt76/mt76x2/mac.h

@@ -17,8 +17,8 @@
 #ifndef __MT76x2_MAC_H
 #define __MT76x2_MAC_H
 
-#include "mt76.h"
-#include "mt76x02_mac.h"
+#include "../mt76.h"
+#include "../mt76x02_mac.h"
 
 struct mt76x2_dev;
 struct mt76x2_sta;

drivers/net/wireless/mediatek/mt76/mt76x2/mcu.c

@@ -20,9 +20,9 @@
 #include <linux/delay.h>
 
 #include "mt76x2.h"
-#include "mt76x2_mcu.h"
-#include "mt76x2_eeprom.h"
-#include "mt76x02_dma.h"
+#include "mcu.h"
+#include "eeprom.h"
+#include "../mt76x02_dma.h"
 
 int mt76x2_mcu_set_channel(struct mt76x2_dev *dev, u8 channel, u8 bw,
 			   u8 bw_index, bool scan)

drivers/net/wireless/mediatek/mt76/mt76x2/mcu.h

@@ -17,7 +17,7 @@
 #ifndef __MT76x2_MCU_H
 #define __MT76x2_MCU_H
 
-#include "mt76x02_mcu.h"
+#include "../mt76x02_mcu.h"
 
 /* Register definitions */
 #define MT_MCU_CPU_CTL			0x0704

drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h

@@ -39,10 +39,10 @@
 
 #define MT_CALIBRATE_INTERVAL	HZ
 
-#include "mt76.h"
-#include "mt76x02_regs.h"
-#include "mt76x2_mac.h"
-#include "mt76x2_dfs.h"
+#include "../mt76.h"
+#include "../mt76x02_regs.h"
+#include "mac.h"
+#include "dfs.h"
 
 struct mt76x2_rx_freq_cal {
 	s8 high_gain[MT_MAX_CHAINS];

drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2u.h

@@ -20,8 +20,8 @@
 #include <linux/device.h>
 
 #include "mt76x2.h"
-#include "mt76x2_mcu.h"
-#include "mt76x02_dma.h"
+#include "mcu.h"
+#include "../mt76x02_dma.h"
 
 #define MT7612U_EEPROM_SIZE		512
 

drivers/net/wireless/mediatek/mt76/mt76x2/pci.c

@@ -19,7 +19,7 @@
 #include <linux/pci.h>
 
 #include "mt76x2.h"
-#include "mt76x2_trace.h"
+#include "trace.h"
 
 static const struct pci_device_id mt76pci_device_table[] = {
 	{ PCI_DEVICE(0x14c3, 0x7662) },

drivers/net/wireless/mediatek/mt76/mt76x2/pci_core.c

@@ -16,8 +16,8 @@
 
 #include <linux/delay.h>
 #include "mt76x2.h"
-#include "mt76x2_trace.h"
-#include "mt76x02_util.h"
+#include "trace.h"
+#include "../mt76x02_util.h"
 
 void mt76x2_rx_poll_complete(struct mt76_dev *mdev, enum mt76_rxq_id q)
 {

drivers/net/wireless/mediatek/mt76/mt76x2/pci_dfs.c

@@ -15,7 +15,7 @@
  */
 
 #include "mt76x2.h"
-#include "mt76x02_util.h"
+#include "../mt76x02_util.h"
 
 #define RADAR_SPEC(m, len, el, eh, wl, wh,		\
 		   w_tolerance, tl, th, t_tolerance,	\

drivers/net/wireless/mediatek/mt76/mt76x2/pci_dma.c

@@ -15,8 +15,8 @@
  */
 
 #include "mt76x2.h"
-#include "mt76x02_dma.h"
-#include "mt76x02_util.h"
+#include "../mt76x02_dma.h"
+#include "../mt76x02_util.h"
 
 void mt76x2_tx_tasklet(unsigned long data)
 {

drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c

@@ -16,10 +16,10 @@
 
 #include <linux/delay.h>
 #include "mt76x2.h"
-#include "mt76x2_eeprom.h"
-#include "mt76x2_mcu.h"
-#include "mt76x02_util.h"
-#include "mt76x02_dma.h"
+#include "eeprom.h"
+#include "mcu.h"
+#include "../mt76x02_util.h"
+#include "../mt76x02_dma.h"
 
 static void
 mt76x2_mac_pbf_init(struct mt76x2_dev *dev)

drivers/net/wireless/mediatek/mt76/mt76x2/pci_mac.c

@@ -16,10 +16,10 @@
 
 #include <linux/delay.h>
 #include "mt76x2.h"
-#include "mt76x2_mcu.h"
-#include "mt76x2_eeprom.h"
-#include "mt76x2_trace.h"
-#include "mt76x02_util.h"
+#include "mcu.h"
+#include "eeprom.h"
+#include "trace.h"
+#include "../mt76x02_util.h"
 
 void mt76x2_mac_set_bssid(struct mt76x2_dev *dev, u8 idx, const u8 *addr)
 {

drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c

@@ -15,7 +15,7 @@
  */
 
 #include "mt76x2.h"
-#include "mt76x02_util.h"
+#include "../mt76x02_util.h"
 
 static int
 mt76x2_start(struct ieee80211_hw *hw)

drivers/net/wireless/mediatek/mt76/mt76x2/pci_mcu.c

@@ -19,9 +19,9 @@
 #include <linux/delay.h>
 
 #include "mt76x2.h"
-#include "mt76x2_mcu.h"
-#include "mt76x2_eeprom.h"
-#include "mt76x02_dma.h"
+#include "mcu.h"
+#include "eeprom.h"
+#include "../mt76x02_dma.h"
 
 static int
 mt76pci_load_rom_patch(struct mt76x2_dev *dev)

drivers/net/wireless/mediatek/mt76/mt76x2/pci_phy.c

@@ -16,8 +16,8 @@
 
 #include <linux/delay.h>
 #include "mt76x2.h"
-#include "mt76x2_mcu.h"
-#include "mt76x2_eeprom.h"
+#include "mcu.h"
+#include "eeprom.h"
 
 static bool
 mt76x2_phy_tssi_init_cal(struct mt76x2_dev *dev)

drivers/net/wireless/mediatek/mt76/mt76x2/pci_trace.c

@@ -18,6 +18,6 @@
 
 #ifndef __CHECKER__
 #define CREATE_TRACE_POINTS
-#include "mt76x2_trace.h"
+#include "trace.h"
 
 #endif

drivers/net/wireless/mediatek/mt76/mt76x2/pci_tx.c

@@ -15,8 +15,8 @@
  */
 
 #include "mt76x2.h"
-#include "mt76x02_util.h"
-#include "mt76x02_dma.h"
+#include "../mt76x02_util.h"
+#include "../mt76x02_dma.h"
 
 struct beacon_bc_data {
 	struct mt76x2_dev *dev;

drivers/net/wireless/mediatek/mt76/mt76x2/phy.c

@@ -16,9 +16,9 @@
  */
 
 #include "mt76x2.h"
-#include "mt76x2_eeprom.h"
-#include "mt76x2_mcu.h"
-#include "mt76x02_phy.h"
+#include "eeprom.h"
+#include "mcu.h"
+#include "../mt76x02_phy.h"
 
 static void
 mt76x2_adjust_high_lna_gain(struct mt76x2_dev *dev, int reg, s8 offset)

drivers/net/wireless/mediatek/mt76/mt76x2/trace.h

@@ -139,6 +139,6 @@ TRACE_EVENT(dev_irq,
 #undef TRACE_INCLUDE_PATH
 #define TRACE_INCLUDE_PATH .
 #undef TRACE_INCLUDE_FILE
-#define TRACE_INCLUDE_FILE mt76x2_trace
+#define TRACE_INCLUDE_FILE trace
 
 #include <trace/define_trace.h>

drivers/net/wireless/mediatek/mt76/mt76x2/tx.c

@@ -16,7 +16,7 @@
  */
 
 #include "mt76x2.h"
-#include "dma.h"
+#include "../dma.h"
 
 void mt76x2_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,
 	       struct sk_buff *skb)

drivers/net/wireless/mediatek/mt76/mt76x2/usb.c

@@ -17,7 +17,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 
-#include "mt76x02_usb.h"
+#include "../mt76x02_usb.h"
 #include "mt76x2u.h"
 
 static const struct usb_device_id mt76x2u_device_table[] = {

drivers/net/wireless/mediatek/mt76/mt76x2/usb_core.c

@@ -15,9 +15,9 @@
  */
 
 #include "mt76x2u.h"
-#include "dma.h"
-#include "mt76x02_util.h"
-#include "mt76x02_usb.h"
+#include "../dma.h"
+#include "../mt76x02_util.h"
+#include "../mt76x02_usb.h"
 
 static int
 mt76x2u_check_skb_rooms(struct sk_buff *skb)

drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c

@@ -17,9 +17,9 @@
 #include <linux/delay.h>
 
 #include "mt76x2u.h"
-#include "mt76x02_util.h"
-#include "mt76x02_phy.h"
-#include "mt76x2_eeprom.h"
+#include "../mt76x02_util.h"
+#include "../mt76x02_phy.h"
+#include "eeprom.h"
 
 static void mt76x2u_init_dma(struct mt76x2_dev *dev)
 {

drivers/net/wireless/mediatek/mt76/mt76x2/usb_mac.c

@@ -15,7 +15,7 @@
  */
 
 #include "mt76x2u.h"
-#include "mt76x2_eeprom.h"
+#include "eeprom.h"
 
 static void mt76x2u_mac_reset_counters(struct mt76x2_dev *dev)
 {

drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c

@@ -15,7 +15,7 @@
  */
 
 #include "mt76x2u.h"
-#include "mt76x02_util.h"
+#include "../mt76x02_util.h"
 
 static int mt76x2u_start(struct ieee80211_hw *hw)
 {

drivers/net/wireless/mediatek/mt76/mt76x2/usb_mcu.c

@@ -17,8 +17,8 @@
 #include <linux/firmware.h>
 
 #include "mt76x2u.h"
-#include "mt76x2_eeprom.h"
-#include "mt76x02_usb.h"
+#include "eeprom.h"
+#include "../mt76x02_usb.h"
 
 #define MT_CMD_HDR_LEN			4
 

drivers/net/wireless/mediatek/mt76/mt76x2/usb_phy.c

@@ -15,7 +15,7 @@
  */
 
 #include "mt76x2u.h"
-#include "mt76x2_eeprom.h"
+#include "eeprom.h"
 
 void mt76x2u_phy_channel_calibrate(struct mt76x2_dev *dev)
 {