From 5ea28dc0c40e3400e43cbb88eb57e5f88c0426dc Mon Sep 17 00:00:00 2001 From: Hoegeun Kwon Date: Mon, 20 Mar 2023 16:39:57 +0900 Subject: [PATCH] mediatek: Add version option to support wifi-6e usb Add version kconfig and makefile option to support wifi-6e usb. Change-Id: I9cf0b7035942fd62018ec6c104f9371b03bf1099 Signed-off-by: Hoegeun Kwon --- drivers/net/wireless/mediatek/Kconfig | 18 ++++++++++++++++++ drivers/net/wireless/mediatek/Makefile | 4 ++++ drivers/net/wireless/mediatek/mt76-6e-usb/Kconfig | 12 ++++++------ 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/mediatek/Kconfig b/drivers/net/wireless/mediatek/Kconfig index bd4db12..a0fc872 100644 --- a/drivers/net/wireless/mediatek/Kconfig +++ b/drivers/net/wireless/mediatek/Kconfig @@ -10,7 +10,25 @@ config WLAN_VENDOR_MEDIATEK questions about these cards. If you say Y, you will be asked for your specific card in the following questions. +choice + prompt "Select vendor mediatek version" + depends on WLAN_VENDOR_MEDIATEK + default MT76_NONE_SUPPORT_6E_USB + +config MT76_NONE_SUPPORT_6E_USB + bool "MediaTek none support wifi-6e usb" + +config MT76_SUPPORT_6E_USB + bool "MediaTek support wifi-6e usb" + +endchoice + if WLAN_VENDOR_MEDIATEK source "drivers/net/wireless/mediatek/mt7601u/Kconfig" +if MT76_NONE_SUPPORT_6E_USB source "drivers/net/wireless/mediatek/mt76/Kconfig" +endif +if MT76_SUPPORT_6E_USB +source "drivers/net/wireless/mediatek/mt76-6e-usb/Kconfig" +endif endif # WLAN_VENDOR_MEDIATEK diff --git a/drivers/net/wireless/mediatek/Makefile b/drivers/net/wireless/mediatek/Makefile index 8061726..b0a183a 100644 --- a/drivers/net/wireless/mediatek/Makefile +++ b/drivers/net/wireless/mediatek/Makefile @@ -1,3 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_MT7601U) += mt7601u/ +ifdef CONFIG_MT76_NONE_SUPPORT_6E_USB obj-$(CONFIG_MT76_CORE) += mt76/ +else +obj-$(CONFIG_MT76_CORE) += mt76-6e-usb/ +endif diff --git a/drivers/net/wireless/mediatek/mt76-6e-usb/Kconfig b/drivers/net/wireless/mediatek/mt76-6e-usb/Kconfig index 9ff43f1..4762d27 100644 --- a/drivers/net/wireless/mediatek/mt76-6e-usb/Kconfig +++ b/drivers/net/wireless/mediatek/mt76-6e-usb/Kconfig @@ -28,9 +28,9 @@ config MT76_CONNAC_LIB tristate select MT76_CORE -source "drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig" -source "drivers/net/wireless/mediatek/mt76/mt76x2/Kconfig" -source "drivers/net/wireless/mediatek/mt76/mt7603/Kconfig" -source "drivers/net/wireless/mediatek/mt76/mt7615/Kconfig" -source "drivers/net/wireless/mediatek/mt76/mt7915/Kconfig" -source "drivers/net/wireless/mediatek/mt76/mt7921/Kconfig" +source "drivers/net/wireless/mediatek/mt76-6e-usb/mt76x0/Kconfig" +source "drivers/net/wireless/mediatek/mt76-6e-usb/mt76x2/Kconfig" +source "drivers/net/wireless/mediatek/mt76-6e-usb/mt7603/Kconfig" +source "drivers/net/wireless/mediatek/mt76-6e-usb/mt7615/Kconfig" +source "drivers/net/wireless/mediatek/mt76-6e-usb/mt7915/Kconfig" +source "drivers/net/wireless/mediatek/mt76-6e-usb/mt7921/Kconfig" -- 2.7.4