1 files changed, 130 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
new file mode 100644
index 000000000000..4515a6053dd0
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -0,0 +1,130 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2008-2009 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ *  Intel Linux Wireless <ilw@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ *****************************************************************************/
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/dma-mapping.h>
+#include <linux/delay.h>
+#include <linux/skbuff.h>
+#include <linux/netdevice.h>
+#include <linux/wireless.h>
+#include <net/mac80211.h>
+#include <linux/etherdevice.h>
+#include <asm/unaligned.h>
+#include "iwl-eeprom.h"
+#include "iwl-dev.h"
+#include "iwl-core.h"
+#include "iwl-io.h"
+#include "iwl-sta.h"
+#include "iwl-helpers.h"
+#include "iwl-5000-hw.h"
+/* Highest firmware API version supported */
+#define IWL6000_UCODE_API_MAX 1
+#define IWL6050_UCODE_API_MAX 1
+/* Lowest firmware API version supported */
+#define IWL6000_UCODE_API_MIN 1
+#define IWL6050_UCODE_API_MIN 1
+#define IWL6000_FW_PRE "iwlwifi-6000-"
+#define _IWL6000_MODULE_FIRMWARE(api) IWL6000_FW_PRE #api ".ucode"
+#define IWL6000_MODULE_FIRMWARE(api) _IWL6000_MODULE_FIRMWARE(api)
+#define IWL6050_FW_PRE "iwlwifi-6050-"
+#define _IWL6050_MODULE_FIRMWARE(api) IWL6050_FW_PRE #api ".ucode"
+#define IWL6050_MODULE_FIRMWARE(api) _IWL6050_MODULE_FIRMWARE(api)
+struct iwl_cfg iwl6000_2ag_cfg = {
+        .name = "6000 Series 2x2 AG",
+        .fw_name_pre = IWL6000_FW_PRE,
+        .ucode_api_max = IWL6000_UCODE_API_MAX,
+        .ucode_api_min = IWL6000_UCODE_API_MIN,
+        .sku = IWL_SKU_A|IWL_SKU_G,
+        .ops = &iwl5000_ops,
+        .eeprom_size = IWL_5000_EEPROM_IMG_SIZE,
+        .eeprom_ver = EEPROM_5000_EEPROM_VERSION,
+        .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
+        .mod_params = &iwl50_mod_params,
+};
+struct iwl_cfg iwl6000_2agn_cfg = {
+        .name = "6000 Series 2x2 AGN",
+        .fw_name_pre = IWL6000_FW_PRE,
+        .ucode_api_max = IWL6000_UCODE_API_MAX,
+        .ucode_api_min = IWL6000_UCODE_API_MIN,
+        .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
+        .ops = &iwl5000_ops,
+        .eeprom_size = IWL_5000_EEPROM_IMG_SIZE,
+        .eeprom_ver = EEPROM_5000_EEPROM_VERSION,
+        .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
+        .mod_params = &iwl50_mod_params,
+};
+struct iwl_cfg iwl6050_2agn_cfg = {
+        .name = "6050 Series 2x2 AGN",
+        .fw_name_pre = IWL6050_FW_PRE,
+        .ucode_api_max = IWL6050_UCODE_API_MAX,
+        .ucode_api_min = IWL6050_UCODE_API_MIN,
+        .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
+        .ops = &iwl5000_ops,
+        .eeprom_size = IWL_5000_EEPROM_IMG_SIZE,
+        .eeprom_ver = EEPROM_5000_EEPROM_VERSION,
+        .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
+        .mod_params = &iwl50_mod_params,
+};
+struct iwl_cfg iwl6000_3agn_cfg = {
+        .name = "6000 Series 3x3 AGN",
+        .fw_name_pre = IWL6000_FW_PRE,
+        .ucode_api_max = IWL6000_UCODE_API_MAX,
+        .ucode_api_min = IWL6000_UCODE_API_MIN,
+        .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
+        .ops = &iwl5000_ops,
+        .eeprom_size = IWL_5000_EEPROM_IMG_SIZE,
+        .eeprom_ver = EEPROM_5000_EEPROM_VERSION,
+        .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
+        .mod_params = &iwl50_mod_params,
+};
+struct iwl_cfg iwl6050_3agn_cfg = {
+        .name = "6050 Series 3x3 AGN",
+        .fw_name_pre = IWL6050_FW_PRE,
+        .ucode_api_max = IWL6050_UCODE_API_MAX,
+        .ucode_api_min = IWL6050_UCODE_API_MIN,
+        .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
+        .ops = &iwl5000_ops,
+        .eeprom_size = IWL_5000_EEPROM_IMG_SIZE,
+        .eeprom_ver = EEPROM_5000_EEPROM_VERSION,
+        .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
+        .mod_params = &iwl50_mod_params,
+};
+MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));
+MODULE_FIRMWARE(IWL6050_MODULE_FIRMWARE(IWL6050_UCODE_API_MAX));

diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c new file mode 100644 index 000000000000..4515a6053dd0 --- /dev/null +++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -0,0 +1,130 @@
	1	/******************************************************************************
	2	*
	3	* Copyright(c) 2008-2009 Intel Corporation. All rights reserved.
	4	*
	5	* This program is free software; you can redistribute it and/or modify it
	6	* under the terms of version 2 of the GNU General Public License as
	7	* published by the Free Software Foundation.
	8	*
	9	* This program is distributed in the hope that it will be useful, but WITHOUT
	10	* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
	11	* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
	12	* more details.
	13	*
	14	* You should have received a copy of the GNU General Public License along with
	15	* this program; if not, write to the Free Software Foundation, Inc.,
	16	* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
	17	*
	18	* The full GNU General Public License is included in this distribution in the
	19	* file called LICENSE.
	20	*
	21	* Contact Information:
	22	* Intel Linux Wireless <ilw@linux.intel.com>
	23	* Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
	24	*
	25	*****************************************************************************/
	26
	27	#include <linux/kernel.h>
	28	#include <linux/module.h>
	29	#include <linux/init.h>
	30	#include <linux/pci.h>
	31	#include <linux/dma-mapping.h>
	32	#include <linux/delay.h>
	33	#include <linux/skbuff.h>
	34	#include <linux/netdevice.h>
	35	#include <linux/wireless.h>
	36	#include <net/mac80211.h>
	37	#include <linux/etherdevice.h>
	38	#include <asm/unaligned.h>
	39
	40	#include "iwl-eeprom.h"
	41	#include "iwl-dev.h"
	42	#include "iwl-core.h"
	43	#include "iwl-io.h"
	44	#include "iwl-sta.h"
	45	#include "iwl-helpers.h"
	46	#include "iwl-5000-hw.h"
	47
	48	/* Highest firmware API version supported */
	49	#define IWL6000_UCODE_API_MAX 1
	50	#define IWL6050_UCODE_API_MAX 1
	51
	52	/* Lowest firmware API version supported */
	53	#define IWL6000_UCODE_API_MIN 1
	54	#define IWL6050_UCODE_API_MIN 1
	55
	56	#define IWL6000_FW_PRE "iwlwifi-6000-"
	57	#define _IWL6000_MODULE_FIRMWARE(api) IWL6000_FW_PRE #api ".ucode"
	58	#define IWL6000_MODULE_FIRMWARE(api) _IWL6000_MODULE_FIRMWARE(api)
	59
	60	#define IWL6050_FW_PRE "iwlwifi-6050-"
	61	#define _IWL6050_MODULE_FIRMWARE(api) IWL6050_FW_PRE #api ".ucode"
	62	#define IWL6050_MODULE_FIRMWARE(api) _IWL6050_MODULE_FIRMWARE(api)
	63
	64	struct iwl_cfg iwl6000_2ag_cfg = {
	65	.name = "6000 Series 2x2 AG",
	66	.fw_name_pre = IWL6000_FW_PRE,
	67	.ucode_api_max = IWL6000_UCODE_API_MAX,
	68	.ucode_api_min = IWL6000_UCODE_API_MIN,
	69	.sku = IWL_SKU_A\|IWL_SKU_G,
	70	.ops = &iwl5000_ops,
	71	.eeprom_size = IWL_5000_EEPROM_IMG_SIZE,
	72	.eeprom_ver = EEPROM_5000_EEPROM_VERSION,
	73	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
	74	.mod_params = &iwl50_mod_params,
	75	};
	76
	77	struct iwl_cfg iwl6000_2agn_cfg = {
	78	.name = "6000 Series 2x2 AGN",
	79	.fw_name_pre = IWL6000_FW_PRE,
	80	.ucode_api_max = IWL6000_UCODE_API_MAX,
	81	.ucode_api_min = IWL6000_UCODE_API_MIN,
	82	.sku = IWL_SKU_A\|IWL_SKU_G\|IWL_SKU_N,
	83	.ops = &iwl5000_ops,
	84	.eeprom_size = IWL_5000_EEPROM_IMG_SIZE,
	85	.eeprom_ver = EEPROM_5000_EEPROM_VERSION,
	86	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
	87	.mod_params = &iwl50_mod_params,
	88	};
	89
	90	struct iwl_cfg iwl6050_2agn_cfg = {
	91	.name = "6050 Series 2x2 AGN",
	92	.fw_name_pre = IWL6050_FW_PRE,
	93	.ucode_api_max = IWL6050_UCODE_API_MAX,
	94	.ucode_api_min = IWL6050_UCODE_API_MIN,
	95	.sku = IWL_SKU_A\|IWL_SKU_G\|IWL_SKU_N,
	96	.ops = &iwl5000_ops,
	97	.eeprom_size = IWL_5000_EEPROM_IMG_SIZE,
	98	.eeprom_ver = EEPROM_5000_EEPROM_VERSION,
	99	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
	100	.mod_params = &iwl50_mod_params,
	101	};
	102
	103	struct iwl_cfg iwl6000_3agn_cfg = {
	104	.name = "6000 Series 3x3 AGN",
	105	.fw_name_pre = IWL6000_FW_PRE,
	106	.ucode_api_max = IWL6000_UCODE_API_MAX,
	107	.ucode_api_min = IWL6000_UCODE_API_MIN,
	108	.sku = IWL_SKU_A\|IWL_SKU_G\|IWL_SKU_N,
	109	.ops = &iwl5000_ops,
	110	.eeprom_size = IWL_5000_EEPROM_IMG_SIZE,
	111	.eeprom_ver = EEPROM_5000_EEPROM_VERSION,
	112	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
	113	.mod_params = &iwl50_mod_params,
	114	};
	115
	116	struct iwl_cfg iwl6050_3agn_cfg = {
	117	.name = "6050 Series 3x3 AGN",
	118	.fw_name_pre = IWL6050_FW_PRE,
	119	.ucode_api_max = IWL6050_UCODE_API_MAX,
	120	.ucode_api_min = IWL6050_UCODE_API_MIN,
	121	.sku = IWL_SKU_A\|IWL_SKU_G\|IWL_SKU_N,
	122	.ops = &iwl5000_ops,
	123	.eeprom_size = IWL_5000_EEPROM_IMG_SIZE,
	124	.eeprom_ver = EEPROM_5000_EEPROM_VERSION,
	125	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
	126	.mod_params = &iwl50_mod_params,
	127	};
	128
	129	MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));
	130	MODULE_FIRMWARE(IWL6050_MODULE_FIRMWARE(IWL6050_UCODE_API_MAX));