Merge branch 'for-2.6.30' into for-2.6.31

[pandora-kernel.git] / drivers / net / wireless / rt2x00 / rt61pci.h

diff --git a/drivers/net/wireless/rt2x00/rt61pci.h b/drivers/net/wireless/rt2x00/rt61pci.h
index 65fe333..41e8959 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt61pci.h
+++ b/drivers/net/wireless/rt2x00/rt61pci.h
@@ -1,5 +1,5 @@
 /*
-       Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
+       Copyright (C) 2004 - 2009 rt2x00 SourceForge Project
        <http://rt2x00.serialmonkey.com>
 
        This program is free software; you can redistribute it and/or modify
@@ -50,8 +50,8 @@
 #define EEPROM_SIZE                    0x0100
 #define BBP_BASE                       0x0000
 #define BBP_SIZE                       0x0080
-#define RF_BASE                                0x0000
-#define RF_SIZE                                0x0014
+#define RF_BASE                                0x0004
+#define RF_SIZE                                0x0010
 
 /*
  * Number of TX queues.
@@ -88,8 +88,10 @@
 
 /*
  * SOFT_RESET_CSR
+ * FORCE_CLOCK_ON: Host force MAC clock ON
  */
 #define SOFT_RESET_CSR                 0x0010
+#define SOFT_RESET_CSR_FORCE_CLOCK_ON  FIELD32(0x00000002)
 
 /*
  * MCU_INT_SOURCE_CSR: MCU interrupt source/mask register.
@@ -1054,8 +1056,10 @@ struct hw_pairwise_ta_entry {
 
 /*
  * IO_CNTL_CSR
+ * RF_PS: Set RF interface value to power save
  */
 #define IO_CNTL_CSR                    0x3498
+#define IO_CNTL_CSR_RF_PS              FIELD32(0x00000004)
 
 /*
  * UART_INT_SOURCE_CSR
@@ -1186,7 +1190,8 @@ struct hw_pairwise_ta_entry {
 #define EEPROM_NIC                     0x0011
 #define EEPROM_NIC_ENABLE_DIVERSITY    FIELD16(0x0001)
 #define EEPROM_NIC_TX_DIVERSITY                FIELD16(0x0002)
-#define EEPROM_NIC_TX_RX_FIXED         FIELD16(0x000c)
+#define EEPROM_NIC_RX_FIXED            FIELD16(0x0004)
+#define EEPROM_NIC_TX_FIXED            FIELD16(0x0008)
 #define EEPROM_NIC_EXTERNAL_LNA_BG     FIELD16(0x0010)
 #define EEPROM_NIC_CARDBUS_ACCEL       FIELD16(0x0020)
 #define EEPROM_NIC_EXTERNAL_LNA_A      FIELD16(0x0040)