iwlwifi: move pu devices to new table

[linux-2.6-microblaze.git] / drivers / net / wireless / intel / iwlwifi / cfg / 9000.c

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/9000.c b/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
index 379ea78..3844264 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
@@ -178,121 +178,44 @@ const struct iwl_cfg_trans_params iwl9000_trans_cfg = {
        .rf_id = true,
 };
 
-const struct iwl_cfg iwl9160_2ac_cfg = {
-       .name = "Intel(R) Dual Band Wireless AC 9160",
-       .fw_name_pre = IWL9260_FW_PRE,
-       IWL_DEVICE_9000,
-};
-
 const struct iwl_cfg iwl9260_2ac_cfg = {
-       .name = "Intel(R) Dual Band Wireless AC 9260",
        .fw_name_pre = IWL9260_FW_PRE,
        IWL_DEVICE_9000,
 };
 
+const char iwl9162_name[] = "Intel(R) Wireless-AC 9162";
+const char iwl9260_name[] = "Intel(R) Wireless-AC 9260";
+const char iwl9260_1_name[] = "Intel(R) Wireless-AC 9260-1";
+const char iwl9270_name[] = "Intel(R) Wireless-AC 9270";
+const char iwl9461_name[] = "Intel(R) Wireless-AC 9461";
+const char iwl9462_name[] = "Intel(R) Wireless-AC 9462";
+const char iwl9560_name[] = "Intel(R) Wireless-AC 9560";
+const char iwl9162_160_name[] = "Intel(R) Wireless-AC 9162 160MHz";
 const char iwl9260_160_name[] = "Intel(R) Wireless-AC 9260 160MHz";
+const char iwl9270_160_name[] = "Intel(R) Wireless-AC 9270 160MHz";
+const char iwl9461_160_name[] = "Intel(R) Wireless-AC 9461 160MHz";
+const char iwl9462_160_name[] = "Intel(R) Wireless-AC 9462 160MHz";
 const char iwl9560_160_name[] = "Intel(R) Wireless-AC 9560 160MHz";
 
-const struct iwl_cfg iwl9260_2ac_160_cfg = {
-       .fw_name_pre = IWL9260_FW_PRE,
-       IWL_DEVICE_9000,
-};
-
-const struct iwl_cfg iwl9260_killer_2ac_cfg = {
-       .name = "Killer (R) Wireless-AC 1550 Wireless Network Adapter (9260NGW)",
-       .fw_name_pre = IWL9260_FW_PRE,
-       IWL_DEVICE_9000,
-};
-
-const struct iwl_cfg iwl9270_2ac_cfg = {
-       .name = "Intel(R) Dual Band Wireless AC 9270",
-       .fw_name_pre = IWL9260_FW_PRE,
-       IWL_DEVICE_9000,
-};
-
-const struct iwl_cfg iwl9460_2ac_cfg = {
-       .name = "Intel(R) Dual Band Wireless AC 9460",
-       .fw_name_pre = IWL9260_FW_PRE,
-       IWL_DEVICE_9000,
-};
-
-const struct iwl_cfg iwl9460_2ac_cfg_soc = {
-       .name = "Intel(R) Dual Band Wireless AC 9460",
-       .fw_name_pre = IWL9000_FW_PRE,
-       IWL_DEVICE_9000,
-       .integrated = true,
-       .soc_latency = 5000,
-};
-
-const struct iwl_cfg iwl9461_2ac_cfg_soc = {
-       .name = "Intel(R) Dual Band Wireless AC 9461",
-       .fw_name_pre = IWL9000_FW_PRE,
-       IWL_DEVICE_9000,
-       .integrated = true,
-       .soc_latency = 5000,
-};
-
-const struct iwl_cfg iwl9462_2ac_cfg_soc = {
-       .name = "Intel(R) Dual Band Wireless AC 9462",
-       .fw_name_pre = IWL9000_FW_PRE,
-       IWL_DEVICE_9000,
-       .integrated = true,
-       .soc_latency = 5000,
-};
+const char iwl9260_killer_1550_name[] =
+       "Killer (R) Wireless-AC 1550 Wireless Network Adapter (9260NGW)";
+const char iwl9560_killer_1550i_name[] =
+       "Killer (R) Wireless-AC 1550i Wireless Network Adapter (9560NGW)";
+const char iwl9560_killer_1550s_name[] =
+       "Killer (R) Wireless-AC 1550s Wireless Network Adapter (9560NGW)";
 
 const struct iwl_cfg iwl9560_2ac_cfg = {
-       .name = "Intel(R) Dual Band Wireless AC 9560",
-       .fw_name_pre = IWL9260_FW_PRE,
-       IWL_DEVICE_9000,
-};
-
-const struct iwl_cfg iwl9560_2ac_160_cfg = {
-       .name = "Intel(R) Wireless-AC 9560 160MHz",
        .fw_name_pre = IWL9260_FW_PRE,
        IWL_DEVICE_9000,
 };
 
 const struct iwl_cfg iwl9560_2ac_cfg_soc = {
-       .name = "Intel(R) Dual Band Wireless AC 9560",
        .fw_name_pre = IWL9000_FW_PRE,
        IWL_DEVICE_9000,
        .integrated = true,
        .soc_latency = 5000,
 };
 
-const struct iwl_cfg iwl9560_2ac_160_cfg_soc = {
-       .name = "Intel(R) Wireless-AC 9560 160MHz",
-       .fw_name_pre = IWL9000_FW_PRE,
-       IWL_DEVICE_9000,
-       .integrated = true,
-       .soc_latency = 5000,
-};
-
-const struct iwl_cfg iwl9560_killer_2ac_cfg_soc = {
-       .name = "Killer (R) Wireless-AC 1550i Wireless Network Adapter (9560NGW)",
-       .fw_name_pre = IWL9000_FW_PRE,
-       IWL_DEVICE_9000,
-       .integrated = true,
-       .soc_latency = 5000,
-};
-
-const struct iwl_cfg iwl9560_killer_s_2ac_cfg_soc = {
-       .name = "Killer (R) Wireless-AC 1550s Wireless Network Adapter (9560NGW)",
-       .fw_name_pre = IWL9000_FW_PRE,
-       IWL_DEVICE_9000,
-       .integrated = true,
-       .soc_latency = 5000,
-};
-
-const struct iwl_cfg iwl9460_2ac_cfg_shared_clk = {
-       .name = "Intel(R) Dual Band Wireless AC 9460",
-       .fw_name_pre = IWL9000_FW_PRE,
-       IWL_DEVICE_9000,
-       .integrated = true,
-       .soc_latency = 5000,
-       .extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK
-};
-
 const struct iwl_cfg iwl9461_2ac_cfg_shared_clk = {
        .name = "Intel(R) Dual Band Wireless AC 9461",
        .fw_name_pre = IWL9000_FW_PRE,