wifi: iwlwifi: remove devices that never came out

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240320232419.b3715c0d4bdd.I1337ed9c3edbec4ea9ff7e8a8b02410d5e69bf74@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-config.h b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
index f1e7b15458c1b2bfb205cf1f6766613a023e46d0..9baa6b2c37db80932899c431175755b739705865 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
@@ -430,8 +430,6 @@ struct iwl_cfg {
 #define IWL_CFG_RF_TYPE_HR2            0x10A
 #define IWL_CFG_RF_TYPE_HR1            0x10C
 #define IWL_CFG_RF_TYPE_GF             0x10D
-#define IWL_CFG_RF_TYPE_MR             0x110
-#define IWL_CFG_RF_TYPE_MS             0x111
 #define IWL_CFG_RF_TYPE_FM             0x112
 #define IWL_CFG_RF_TYPE_WH             0x113
 

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
index 4696d73c8971b671043a8446f88862d8e798502e..ec756e50091d11b2e30bd56b9dac3306a8cf0aae 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
@@ -192,12 +192,6 @@ const char *iwl_drv_get_fwname_pre(struct iwl_trans *trans, char *buf)
        case IWL_CFG_RF_TYPE_GF:
                rf = "gf";
                break;
-       case IWL_CFG_RF_TYPE_MR:
-               rf = "mr";
-               break;
-       case IWL_CFG_RF_TYPE_MS:
-               rf = "ms";
-               break;
        case IWL_CFG_RF_TYPE_FM:
                rf = "fm";
                break;

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
index 9a8d2b69f1548bce8000fbd1a61f69f5c668e3bf..03ff6ee546ce11aa36960755ddad44fa61655960 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
@@ -1025,8 +1025,6 @@ iwl_nvm_fixup_sband_iftd(struct iwl_trans *trans,
 
        switch (CSR_HW_RFID_TYPE(trans->hw_rf_id)) {
        case IWL_CFG_RF_TYPE_GF:
-       case IWL_CFG_RF_TYPE_MR:
-       case IWL_CFG_RF_TYPE_MS:
        case IWL_CFG_RF_TYPE_FM:
        case IWL_CFG_RF_TYPE_WH:
                iftype_data->he_cap.he_cap_elem.phy_cap_info[9] |=

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-prph.h b/drivers/net/wireless/intel/iwlwifi/iwl-prph.h
index a7d44df06eabdc5166b0be54b66aa47fe1f559a9..8df6ec12b74e9395d934831395c7854e96e0e3df 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-prph.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-prph.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
 /*
- * Copyright (C) 2005-2014, 2018-2023 Intel Corporation
+ * Copyright (C) 2005-2014, 2018-2024 Intel Corporation
  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH
  * Copyright (C) 2016 Intel Deutschland GmbH
  */
@@ -453,8 +453,6 @@ enum {
 #define REG_CRF_ID_TYPE_HR_NONE_CDB_1X1        0x501
 #define REG_CRF_ID_TYPE_HR_NONE_CDB_CCP        0x532
 #define REG_CRF_ID_TYPE_GF                     0x410
-#define REG_CRF_ID_TYPE_GF_TC                  0xF08
-#define REG_CRF_ID_TYPE_MR                     0x810
 #define REG_CRF_ID_TYPE_FM                     0x910
 #define REG_CRF_ID_TYPE_FMI                    0x930
 #define REG_CRF_ID_TYPE_FMR                    0x900

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index 4cf811afdfa52a82c3679b357cc47132c5850f46..75e5177cf140e2e75b9686f0bb78586a1016fbd2 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -944,11 +944,6 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
                      IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY, IWL_CFG_ANY,
                      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_ANY,
                      iwl_cfg_ma, iwl_ax211_name),
-       _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
-                     IWL_CFG_MAC_TYPE_MA, IWL_CFG_ANY,
-                     IWL_CFG_RF_TYPE_MR, IWL_CFG_ANY, IWL_CFG_ANY,
-                     IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,
-                     iwl_cfg_ma, iwl_ax221_name),
        _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
                      IWL_CFG_MAC_TYPE_MA, IWL_CFG_ANY,
                      IWL_CFG_RF_TYPE_FM, IWL_CFG_ANY, IWL_CFG_ANY,
@@ -1100,24 +1095,6 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
                      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,
                      iwlax210_2ax_cfg_so_jf_b0, iwl9462_name),
 
-/* MsP */
-/* For now we use the same FW as MR, but this will change in the future. */
-       _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
-                     IWL_CFG_MAC_TYPE_SO, IWL_CFG_ANY,
-                     IWL_CFG_RF_TYPE_MS, IWL_CFG_ANY, IWL_CFG_ANY,
-                     IWL_CFG_160, IWL_CFG_ANY, IWL_CFG_NO_CDB,
-                     iwl_cfg_so_a0_ms_a0, iwl_ax204_name),
-       _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
-                     IWL_CFG_MAC_TYPE_SOF, IWL_CFG_ANY,
-                     IWL_CFG_RF_TYPE_MS, IWL_CFG_ANY, IWL_CFG_ANY,
-                     IWL_CFG_160, IWL_CFG_ANY, IWL_CFG_NO_CDB,
-                     iwl_cfg_so_a0_ms_a0, iwl_ax204_name),
-       _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
-                     IWL_CFG_MAC_TYPE_MA, IWL_CFG_ANY,
-                     IWL_CFG_RF_TYPE_MS, IWL_CFG_ANY, IWL_CFG_ANY,
-                     IWL_CFG_160, IWL_CFG_ANY, IWL_CFG_NO_CDB,
-                     iwl_cfg_ma, iwl_ax204_name),
-
 /* Sc */
        _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
                      IWL_CFG_MAC_TYPE_SC, IWL_CFG_ANY,
@@ -1224,9 +1201,6 @@ static int map_crf_id(struct iwl_trans *iwl_trans)
        case REG_CRF_ID_TYPE_GF:
                iwl_trans->hw_rf_id = (IWL_CFG_RF_TYPE_GF << 12);
                break;
-       case REG_CRF_ID_TYPE_MR:
-               iwl_trans->hw_rf_id = (IWL_CFG_RF_TYPE_MR << 12);
-               break;
        case REG_CRF_ID_TYPE_FM:
        case REG_CRF_ID_TYPE_FMI:
        case REG_CRF_ID_TYPE_FMR: