Commit 910edaea authored by Johannes Berg's avatar Johannes Berg Committed by Miri Korenblit
Browse files

wifi: iwlwifi: cfg: fix PE RF names 



There are a couple of variants of this, match them correctly
to their names and clean up a bit.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250510214621.d03eaad5be56.I276a09f0cad364e51ed4730ca81fbe504e61f2c7@changeid
parent 9e4cb387

drivers/net/wireless/intel/iwlwifi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ iwlwifi-$(CONFIG_IWLMVM) += cfg/ax210.o 
iwlwifi-$(CONFIG_IWLMLD) += cfg/bz.o cfg/sc.o cfg/dr.o

# RF configurations

iwlwifi-$(CONFIG_IWLMVM) += cfg/rf-jf.o cfg/rf-hr.o cfg/rf-gf.o

iwlwifi-$(CONFIG_IWLMLD) += cfg/rf-fm.o cfg/rf-wh.o

iwlwifi-$(CONFIG_IWLMLD) += cfg/rf-fm.o cfg/rf-wh.o cfg/rf-pe.o



iwlwifi-objs		+= iwl-dbg-tlv.o

iwlwifi-objs		+= iwl-trans.o

drivers/net/wireless/intel/iwlwifi/cfg/rf-pe.c

0 → 100644
+16 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause

/*

 * Copyright (C) 2025 Intel Corporation

 */

#include "iwl-config.h"



/* currently iwl_rf_wh/iwl_rf_wh_160mhz are just defines for the FM ones */



const char iwl_killer_bn1850w2_name[] =

	"Killer(R) Wi-Fi 8 BN1850w2 320MHz Wireless Network Adapter (BN201.D2W)";

const char iwl_killer_bn1850i_name[] =

	"Killer(R) Wi-Fi 8 BN1850i 320MHz Wireless Network Adapter (BN201.NGW)";



const char iwl_bn201_name[] = "Intel(R) Wi-Fi 8 BN201";

const char iwl_be221_name[] = "Intel(R) Wi-Fi 7 BE221";

const char iwl_be223_name[] = "Intel(R) Wi-Fi 7 BE223";

drivers/net/wireless/intel/iwlwifi/cfg/sc.c

+0 −2
Original line number Diff line number Diff line
@@ -105,8 +105,6 @@ const struct iwl_mac_cfg iwl_sc_mac_cfg = { 
	.ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US,

};



const char iwl_pe_name[] = "Intel(R) Wi-Fi 8 BN201";



IWL_FW_AND_PNVM(IWL_SC_A_FM_B_FW_PRE, IWL_SC_UCODE_API_MAX);

IWL_FW_AND_PNVM(IWL_SC_A_FM_C_FW_PRE, IWL_SC_UCODE_API_MAX);

MODULE_FIRMWARE(IWL_SC_A_HR_A_FW_MODULE_FIRMWARE(IWL_SC_UCODE_API_MAX));

drivers/net/wireless/intel/iwlwifi/iwl-config.h

+5 −1
Original line number Diff line number Diff line
@@ -647,7 +647,11 @@ extern const char iwl_be213_name[]; 
extern const char iwl_killer_be1775s_name[];

extern const char iwl_killer_be1775i_name[];

extern const char iwl_be211_name[];

extern const char iwl_pe_name[];

extern const char iwl_killer_bn1850w2_name[];

extern const char iwl_killer_bn1850i_name[];

extern const char iwl_bn201_name[];

extern const char iwl_be221_name[];

extern const char iwl_be223_name[];

extern const char iwl_dr_name[];

extern const char iwl_br_name[];

#if IS_ENABLED(CONFIG_IWLDVM)

drivers/net/wireless/intel/iwlwifi/pcie/drv.c

+7 −10
Original line number Diff line number Diff line
@@ -1023,20 +1023,17 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = { 
	IWL_DEV_INFO(iwl_rf_wh, iwl_be211_name, RF_TYPE(WH)),

	IWL_DEV_INFO(iwl_rf_wh_160mhz, iwl_be213_name, RF_TYPE(WH), BW_LIMITED),



/* PE RF */

	IWL_DEV_INFO(iwl_rf_pe, iwl_bn201_name, RF_TYPE(PE)),

	IWL_DEV_INFO(iwl_rf_pe, iwl_be223_name, RF_TYPE(PE), SUBDEV(0x0524)),

	IWL_DEV_INFO(iwl_rf_pe, iwl_be221_name, RF_TYPE(PE), SUBDEV(0x0324)),



/* Killer */

	IWL_DEV_INFO(iwl_rf_wh, iwl_killer_be1775s_name, SUBDEV(0x1776)),

	IWL_DEV_INFO(iwl_rf_wh, iwl_killer_be1775i_name, SUBDEV(0x1775)),



/* Sc */

	IWL_DEV_INFO(iwl_rf_pe, iwl_pe_name, MAC_TYPE(SC), RF_TYPE(PE)),

	IWL_DEV_INFO(iwl_rf_pe, iwl_pe_name, MAC_TYPE(SC2), RF_TYPE(PE)),

	IWL_DEV_INFO(iwl_rf_pe, iwl_pe_name, MAC_TYPE(SC2F), RF_TYPE(PE)),



/* Dr */

	IWL_DEV_INFO(iwl_rf_pe, iwl_dr_name, MAC_TYPE(DR), RF_TYPE(PE)),



/* Br */

	IWL_DEV_INFO(iwl_rf_pe, iwl_br_name, MAC_TYPE(BR), RF_TYPE(PE)),

	IWL_DEV_INFO(iwl_rf_pe, iwl_killer_bn1850w2_name, SUBDEV(0x1851)),

	IWL_DEV_INFO(iwl_rf_pe, iwl_killer_bn1850i_name, SUBDEV(0x1852)),

#endif /* CONFIG_IWLMLD */

};

EXPORT_SYMBOL_IF_IWLWIFI_KUNIT(iwl_dev_info_table);