| From c564a5f814d9e1a2093ee402a893372c87bfbf07 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 19 Jul 2021 14:45:39 +0200 |
| Subject: iwlwifi: add new so-jf devices |
| |
| From: Yaara Baruch <yaara.baruch@intel.com> |
| |
| [ Upstream commit 891332f697e14bfb2002f56e21d9bbd4800a7098 ] |
| |
| Add new so-jf devices to the driver. |
| |
| Signed-off-by: Yaara Baruch <yaara.baruch@intel.com> |
| Signed-off-by: Johannes Berg <johannes.berg@intel.com> |
| Signed-off-by: Kalle Valo <kvalo@codeaurora.org> |
| Link: https://lore.kernel.org/r/20210719144523.1c9a59fd2760.If5aef1942007828210f0f2c4a17985f63050bb45@changeid |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 36 ++++++++++++++++++- |
| 1 file changed, 35 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c |
| index cd204a9ec87d..9f11a1d5d034 100644 |
| --- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c |
| +++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c |
| @@ -1142,7 +1142,41 @@ static const struct iwl_dev_info iwl_dev_info_table[] = { |
| IWL_CFG_MAC_TYPE_SO, IWL_CFG_ANY, |
| IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY, |
| IWL_CFG_160, IWL_CFG_ANY, IWL_CFG_NO_CDB, |
| - iwlax211_2ax_cfg_so_gf_a0, iwl_ax211_name) |
| + iwlax211_2ax_cfg_so_gf_a0, iwl_ax211_name), |
| + |
| +/* So with JF2 */ |
| + _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY, |
| + IWL_CFG_MAC_TYPE_SO, IWL_CFG_ANY, |
| + IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF, |
| + IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB, |
| + iwlax210_2ax_cfg_so_jf_b0, iwl9560_160_name), |
| + _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY, |
| + IWL_CFG_MAC_TYPE_SO, IWL_CFG_ANY, |
| + IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF, |
| + IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB, |
| + iwlax210_2ax_cfg_so_jf_b0, iwl9560_name), |
| + |
| +/* So with JF */ |
| + _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY, |
| + IWL_CFG_MAC_TYPE_SO, IWL_CFG_ANY, |
| + IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1, |
| + IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB, |
| + iwlax210_2ax_cfg_so_jf_b0, iwl9461_160_name), |
| + _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY, |
| + IWL_CFG_MAC_TYPE_SO, IWL_CFG_ANY, |
| + IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV, |
| + IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB, |
| + iwlax210_2ax_cfg_so_jf_b0, iwl9462_160_name), |
| + _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY, |
| + IWL_CFG_MAC_TYPE_SO, IWL_CFG_ANY, |
| + IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1, |
| + IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB, |
| + iwlax210_2ax_cfg_so_jf_b0, iwl9461_name), |
| + _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY, |
| + IWL_CFG_MAC_TYPE_SO, IWL_CFG_ANY, |
| + IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV, |
| + IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB, |
| + iwlax210_2ax_cfg_so_jf_b0, iwl9462_name) |
| |
| #endif /* CONFIG_IWLMVM */ |
| }; |
| -- |
| 2.30.2 |
| |
