[iwlwifi-next,02/15] wifi: iwlwifi: remove TH/TH1 RF types

Message ID	20250501125731.d0e40b4a4114.Idd76734c310cf5f27de43d24e71b27467ab5905a@changeid
State	New
Headers	show Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 64A1022CBF6 for <linux-wireless@vger.kernel.org>; Thu, 1 May 2025 09:59:55 +0000 (UTC) From: Miri Korenblit <miriam.rachel.korenblit@intel.com> To: miriam.rachel.korenblit@intel.com Cc: linux-wireless@vger.kernel.org, Johannes Berg <johannes.berg@intel.com>, Emmanuel Grumbach <emmanuel.grumbach@intel.com> Subject: [PATCH iwlwifi-next 02/15] wifi: iwlwifi: remove TH/TH1 RF types Date: Thu, 1 May 2025 12:59:24 +0300 Message-Id: <20250501125731.d0e40b4a4114.Idd76734c310cf5f27de43d24e71b27467ab5905a@changeid> In-Reply-To: <20250501095937.2097123-1-miriam.rachel.korenblit@intel.com> References: <20250501095937.2097123-1-miriam.rachel.korenblit@intel.com> Precedence: bulk MIME-Version: 1.0 Organization: Intel Israel (74) Limited Content-Transfer-Encoding: 8bit
Series	wifi: iwlwifi: updates - 2025-05-01 \| expand [iwlwifi-next,00/15] wifi: iwlwifi: updates - 2025-05-01 [iwlwifi-next,01/15] wifi: iwlwifi: clean up config macro [iwlwifi-next,02/15] wifi: iwlwifi: remove TH/TH1 RF types [iwlwifi-next,03/15] wifi: iwlwifi: pcie: Add support for new device ids [iwlwifi-next,04/15] wifi: iwlwifi: remove duplicated line [iwlwifi-next,05/15] wifi: iwlwifi: unify some configurations [iwlwifi-next,06/15] wifi: iwlwifi: pcie: add entry for Killer AX1650i on AdL-P [iwlwifi-next,07/15] wifi: iwlwifi: tests: check for device names [iwlwifi-next,08/15] wifi: iwlwifi: cfg: remove fw_name_mac [iwlwifi-next,09/15] wifi: iwlwifi: cfg: unify Qu/QuZ configs [iwlwifi-next,10/15] wifi: iwlwifi: cfg: unify Killer 1650s/i with Qu/Hr [iwlwifi-next,11/15] wifi: iwlwifi: cfg: remove unused config externs [iwlwifi-next,12/15] wifi: iwlwifi: cfg: remove max_tx_agg_size [iwlwifi-next,13/15] wifi: iwlwifi: cfg: remove iwl_ax201_cfg_qu_hr [iwlwifi-next,14/15] wifi: iwlwifi: cfg: remove duplicated iwl_cfg_gl [iwlwifi-next,15/15] wifi: iwlwifi: cfg: remove duplicated Sc device configs

Message ID

20250501125731.d0e40b4a4114.Idd76734c310cf5f27de43d24e71b27467ab5905a@changeid

State

New

Headers

From: Miri Korenblit <miriam.rachel.korenblit@intel.com>
To: miriam.rachel.korenblit@intel.com
Cc: linux-wireless@vger.kernel.org,
	Johannes Berg <johannes.berg@intel.com>,
	Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Subject: [PATCH iwlwifi-next 02/15] wifi: iwlwifi: remove TH/TH1 RF types
Date: Thu,  1 May 2025 12:59:24 +0300
Message-Id: 
 <20250501125731.d0e40b4a4114.Idd76734c310cf5f27de43d24e71b27467ab5905a@changeid>
In-Reply-To: <20250501095937.2097123-1-miriam.rachel.korenblit@intel.com>
References: <20250501095937.2097123-1-miriam.rachel.korenblit@intel.com>
Precedence: bulk
MIME-Version: 1.0
Organization: Intel Israel (74) Limited
Content-Transfer-Encoding: 8bit

Series

wifi: iwlwifi: updates - 2025-05-01 | expand

Commit Message

Miri Korenblit May 1, 2025, 9:59 a.m. UTC

From: Johannes Berg <johannes.berg@intel.com>

There are the same values as JF2/JF1 respectively, and
that really matches the code names. Remove TH/TH1.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
---
 drivers/net/wireless/intel/iwlwifi/iwl-config.h |  2 --
 drivers/net/wireless/intel/iwlwifi/pcie/drv.c   | 12 ++++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-config.h b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
index b9bd89bfdd74..f9fdb7c97636 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
@@ -432,8 +432,6 @@  struct iwl_cfg {
 #define IWL_CFG_MAC_TYPE_BR		0x4C
 #define IWL_CFG_MAC_TYPE_DR		0x4D
 
-#define IWL_CFG_RF_TYPE_TH		0x105
-#define IWL_CFG_RF_TYPE_TH1		0x108
 #define IWL_CFG_RF_TYPE_JF2		0x105
 #define IWL_CFG_RF_TYPE_JF1		0x108
 #define IWL_CFG_RF_TYPE_HR2		0x10A
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index e9660d05d55d..2480fba9b140 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -903,24 +903,24 @@  VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
 		     BW_LIMIT(80), CORES(BT), NO_CDB),
 
 	IWL_DEV_INFO(iwl9260_2ac_cfg, iwl9270_160_name, DEVICE(0x2526),
-		     MAC_TYPE(TH), RF_TYPE(TH),
+		     MAC_TYPE(TH), RF_TYPE(JF2),
 		     BW_NO_LIMIT, CORES(BT_GNSS), NO_CDB),
 	IWL_DEV_INFO(iwl9260_2ac_cfg, iwl9270_name, DEVICE(0x2526),
-		     MAC_TYPE(TH), RF_TYPE(TH),
+		     MAC_TYPE(TH), RF_TYPE(JF2),
 		     BW_LIMIT(80), CORES(BT_GNSS), NO_CDB),
 
 	IWL_DEV_INFO(iwl9260_2ac_cfg, iwl9162_160_name, DEVICE(0x271B),
-		     MAC_TYPE(TH), RF_TYPE(TH1),
+		     MAC_TYPE(TH), RF_TYPE(JF1),
 		     BW_NO_LIMIT, CORES(BT), NO_CDB),
 	IWL_DEV_INFO(iwl9260_2ac_cfg, iwl9162_name, DEVICE(0x271B),
-		     MAC_TYPE(TH), RF_TYPE(TH1),
+		     MAC_TYPE(TH), RF_TYPE(JF1),
 		     BW_LIMIT(80), CORES(BT), NO_CDB),
 
 	IWL_DEV_INFO(iwl9260_2ac_cfg, iwl9260_160_name, DEVICE(0x2526),
-		     MAC_TYPE(TH), RF_TYPE(TH),
+		     MAC_TYPE(TH), RF_TYPE(JF2),
 		     BW_NO_LIMIT, CORES(BT), NO_CDB),
 	IWL_DEV_INFO(iwl9260_2ac_cfg, iwl9260_name, DEVICE(0x2526),
-		     MAC_TYPE(TH), RF_TYPE(TH),
+		     MAC_TYPE(TH), RF_TYPE(JF2),
 		     BW_LIMIT(80), CORES(BT), NO_CDB),
 
 /* Qu with Jf */

[iwlwifi-next,02/15] wifi: iwlwifi: remove TH/TH1 RF types

Commit Message

Patch