summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/pcie/drv.c')
-rw-r--r--drivers/net/wireless/intel/iwlwifi/pcie/drv.c116
1 files changed, 58 insertions, 58 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index ef1ca077d899..bf2d8db8cfc4 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -970,30 +970,30 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
DEVICE(0x51F0), SUBDEV(0x1552)),
IWL_DEV_INFO(iwl_rf_jf, iwl9560_killer_1550i_160_name,
DEVICE(0x51F0), SUBDEV(0x1551)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax411_killer_1690s_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax411_killer_1690s_name,
DEVICE(0x51F0), SUBDEV(0x1691)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax411_killer_1690i_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax411_killer_1690i_name,
DEVICE(0x51F0), SUBDEV(0x1692)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax411_killer_1690i_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax411_killer_1690i_name,
DEVICE(0x51F1), SUBDEV(0x1692)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax411_killer_1690s_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax411_killer_1690s_name,
DEVICE(0x54F0), SUBDEV(0x1691)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax411_killer_1690i_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax411_killer_1690i_name,
DEVICE(0x54F0), SUBDEV(0x1692)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax411_killer_1690s_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax411_killer_1690s_name,
DEVICE(0x7A70), SUBDEV(0x1691)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax411_killer_1690i_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax411_killer_1690i_name,
DEVICE(0x7A70), SUBDEV(0x1692)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax411_killer_1690s_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax411_killer_1690s_name,
DEVICE(0x7AF0), SUBDEV(0x1691)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax411_killer_1690i_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax411_killer_1690i_name,
DEVICE(0x7AF0), SUBDEV(0x1692)),
IWL_DEV_INFO(iwl_rf_jf, iwl9260_1_name,
DEVICE(0x271C), SUBDEV(0x0214)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax411_killer_1690s_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax411_killer_1690s_name,
DEVICE(0x7E40), SUBDEV(0x1691)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax411_killer_1690i_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax411_killer_1690i_name,
DEVICE(0x7E40), SUBDEV(0x1692)),
/* AX200 */
@@ -1139,57 +1139,57 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
DEVICE(0x4DF0), SUBDEV(0x6074)),
/* So with HR */
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax211_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name,
DEVICE(0x2725), SUBDEV(0x0090)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax210_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax210_name,
DEVICE(0x2725), SUBDEV(0x0020)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax210_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax210_name,
DEVICE(0x2725), SUBDEV(0x2020)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax210_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax210_name,
DEVICE(0x2725), SUBDEV(0x0024)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax210_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax210_name,
DEVICE(0x2725), SUBDEV(0x0310)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax210_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax210_name,
DEVICE(0x2725), SUBDEV(0x0510)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax210_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax210_name,
DEVICE(0x2725), SUBDEV(0x0A10)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax210_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax210_name,
DEVICE(0x2725), SUBDEV(0xE020)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax210_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax210_name,
DEVICE(0x2725), SUBDEV(0xE024)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax210_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax210_name,
DEVICE(0x2725), SUBDEV(0x4020)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax210_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax210_name,
DEVICE(0x2725), SUBDEV(0x6020)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax210_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax210_name,
DEVICE(0x2725), SUBDEV(0x6024)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax210_killer_1675w_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax210_killer_1675w_name,
DEVICE(0x2725), SUBDEV(0x1673)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax210_killer_1675x_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax210_killer_1675x_name,
DEVICE(0x2725), SUBDEV(0x1674)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax211_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name,
DEVICE(0x7A70), SUBDEV(0x0090)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax211_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name,
DEVICE(0x7A70), SUBDEV(0x0098)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax411_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax411_name,
DEVICE(0x7A70), SUBDEV(0x00B0)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax211_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name,
DEVICE(0x7A70), SUBDEV(0x0310)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax211_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name,
DEVICE(0x7A70), SUBDEV(0x0510)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax211_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name,
DEVICE(0x7A70), SUBDEV(0x0A10)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax211_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name,
DEVICE(0x7AF0), SUBDEV(0x0090)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax211_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name,
DEVICE(0x7AF0), SUBDEV(0x0098)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax411_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax411_name,
DEVICE(0x7AF0), SUBDEV(0x00B0)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax211_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name,
DEVICE(0x7AF0), SUBDEV(0x0310)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax211_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name,
DEVICE(0x7AF0), SUBDEV(0x0510)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax211_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name,
DEVICE(0x7AF0), SUBDEV(0x0A10)),
/* So with JF */
@@ -1203,35 +1203,35 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
DEVICE(0x7AF0), SUBDEV(0x1552)),
/* SO with GF2 */
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax211_killer_1675s_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_killer_1675s_name,
DEVICE(0x51F0), SUBDEV(0x1671)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax211_killer_1675i_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_killer_1675i_name,
DEVICE(0x51F0), SUBDEV(0x1672)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax211_killer_1675s_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_killer_1675s_name,
DEVICE(0x51F1), SUBDEV(0x1671)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax211_killer_1675i_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_killer_1675i_name,
DEVICE(0x51F1), SUBDEV(0x1672)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax211_killer_1675s_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_killer_1675s_name,
DEVICE(0x54F0), SUBDEV(0x1671)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax211_killer_1675i_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_killer_1675i_name,
DEVICE(0x54F0), SUBDEV(0x1672)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax211_killer_1675s_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_killer_1675s_name,
DEVICE(0x7A70), SUBDEV(0x1671)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax211_killer_1675i_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_killer_1675i_name,
DEVICE(0x7A70), SUBDEV(0x1672)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax211_killer_1675s_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_killer_1675s_name,
DEVICE(0x7AF0), SUBDEV(0x1671)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax211_killer_1675i_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_killer_1675i_name,
DEVICE(0x7AF0), SUBDEV(0x1672)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax211_killer_1675s_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_killer_1675s_name,
DEVICE(0x7F70), SUBDEV(0x1671)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax211_killer_1675i_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_killer_1675i_name,
DEVICE(0x7F70), SUBDEV(0x1672)),
/* MA with GF2 */
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax211_killer_1675s_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_killer_1675s_name,
DEVICE(0x7E40), SUBDEV(0x1671)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax211_killer_1675i_name,
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_killer_1675i_name,
DEVICE(0x7E40), SUBDEV(0x1672)),
IWL_DEV_INFO(iwl_rf_jf, iwl9461_160_name, MAC_TYPE(PU),
@@ -1379,10 +1379,10 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
MAC_STEP(B), RF_TYPE(HR2), BW_NOT_LIMITED, NO_CDB),
/* Ma */
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax201_name, MAC_TYPE(MA), RF_TYPE(HR2),
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax201_name, MAC_TYPE(MA), RF_TYPE(HR2),
NO_CDB),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax211_name, MAC_TYPE(MA), RF_TYPE(GF)),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax231_name, MAC_TYPE(MA), RF_TYPE(FM),
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name, MAC_TYPE(MA), RF_TYPE(GF)),
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax231_name, MAC_TYPE(MA), RF_TYPE(FM),
NO_CDB),
/* So with Hr */
@@ -1405,9 +1405,9 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
RF_TYPE(HR2), BW_NOT_LIMITED, NO_CDB),
/* So-F with Gf */
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax211_name, MAC_TYPE(SOF),
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name, MAC_TYPE(SOF),
RF_TYPE(GF), BW_NOT_LIMITED, NO_CDB),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax411_name, MAC_TYPE(SOF),
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax411_name, MAC_TYPE(SOF),
RF_TYPE(GF), BW_NOT_LIMITED, CDB),
/* SoF with JF2 */
@@ -1427,9 +1427,9 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
RF_TYPE(JF1), RF_ID(JF1_DIV), BW_LIMITED, CORES(BT), NO_CDB),
/* So with GF */
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax211_name, MAC_TYPE(SO),
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name, MAC_TYPE(SO),
RF_TYPE(GF), BW_NOT_LIMITED, NO_CDB),
- IWL_DEV_INFO(iwl_cfg_ma, iwl_ax411_name, MAC_TYPE(SO),
+ IWL_DEV_INFO(iwl_rf_gf, iwl_ax411_name, MAC_TYPE(SO),
RF_TYPE(GF), BW_NOT_LIMITED, CDB),
/* So with JF2 */
generated by cgit v1.2.3 (git 2.39.0) at 2025-08-05 03:38:58 +0300