1 files changed, 32 insertions, 20 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h
index e252e9bafd0..6d67c3ede65 100644
--- a/drivers/net/wireless/rt2x00/rt2800.h
+++ b/drivers/net/wireless/rt2x00/rt2800.h
@@ -439,26 +439,33 @@
 #define WMM_TXOP1_CFG_AC3TXOP           FIELD32(0xffff0000)
 
 /*
- * GPIO_CTRL_CFG:
- * GPIOD: GPIO direction, 0: Output, 1: Input
- */
-#define GPIO_CTRL_CFG                   0x0228
-#define GPIO_CTRL_CFG_BIT0              FIELD32(0x00000001)
-#define GPIO_CTRL_CFG_BIT1              FIELD32(0x00000002)
-#define GPIO_CTRL_CFG_BIT2              FIELD32(0x00000004)
-#define GPIO_CTRL_CFG_BIT3              FIELD32(0x00000008)
-#define GPIO_CTRL_CFG_BIT4              FIELD32(0x00000010)
-#define GPIO_CTRL_CFG_BIT5              FIELD32(0x00000020)
-#define GPIO_CTRL_CFG_BIT6              FIELD32(0x00000040)
-#define GPIO_CTRL_CFG_BIT7              FIELD32(0x00000080)
-#define GPIO_CTRL_CFG_GPIOD_BIT0        FIELD32(0x00000100)
-#define GPIO_CTRL_CFG_GPIOD_BIT1        FIELD32(0x00000200)
-#define GPIO_CTRL_CFG_GPIOD_BIT2        FIELD32(0x00000400)
-#define GPIO_CTRL_CFG_GPIOD_BIT3        FIELD32(0x00000800)
-#define GPIO_CTRL_CFG_GPIOD_BIT4        FIELD32(0x00001000)
-#define GPIO_CTRL_CFG_GPIOD_BIT5        FIELD32(0x00002000)
-#define GPIO_CTRL_CFG_GPIOD_BIT6        FIELD32(0x00004000)
-#define GPIO_CTRL_CFG_GPIOD_BIT7        FIELD32(0x00008000)
+ * GPIO_CTRL:
+ *      GPIO_CTRL_VALx: GPIO value
+ *      GPIO_CTRL_DIRx: GPIO direction: 0 = output; 1 = input
+ */
+#define GPIO_CTRL                       0x0228
+#define GPIO_CTRL_VAL0                  FIELD32(0x00000001)
+#define GPIO_CTRL_VAL1                  FIELD32(0x00000002)
+#define GPIO_CTRL_VAL2                  FIELD32(0x00000004)
+#define GPIO_CTRL_VAL3                  FIELD32(0x00000008)
+#define GPIO_CTRL_VAL4                  FIELD32(0x00000010)
+#define GPIO_CTRL_VAL5                  FIELD32(0x00000020)
+#define GPIO_CTRL_VAL6                  FIELD32(0x00000040)
+#define GPIO_CTRL_VAL7                  FIELD32(0x00000080)
+#define GPIO_CTRL_DIR0                  FIELD32(0x00000100)
+#define GPIO_CTRL_DIR1                  FIELD32(0x00000200)
+#define GPIO_CTRL_DIR2                  FIELD32(0x00000400)
+#define GPIO_CTRL_DIR3                  FIELD32(0x00000800)
+#define GPIO_CTRL_DIR4                  FIELD32(0x00001000)
+#define GPIO_CTRL_DIR5                  FIELD32(0x00002000)
+#define GPIO_CTRL_DIR6                  FIELD32(0x00004000)
+#define GPIO_CTRL_DIR7                  FIELD32(0x00008000)
+#define GPIO_CTRL_VAL8                  FIELD32(0x00010000)
+#define GPIO_CTRL_VAL9                  FIELD32(0x00020000)
+#define GPIO_CTRL_VAL10                 FIELD32(0x00040000)
+#define GPIO_CTRL_DIR8                  FIELD32(0x01000000)
+#define GPIO_CTRL_DIR9                  FIELD32(0x02000000)
+#define GPIO_CTRL_DIR10                 FIELD32(0x04000000)
 
 /*
  * MCU_CMD_CFG
@@ -1936,6 +1943,11 @@ struct mac_iveiv_entry {
 #define BBP47_TSSI_ADC6                 FIELD8(0x80)
 
 /*
+ * BBP 49
+ */
+#define BBP49_UPDATE_FLAG               FIELD8(0x01)
+
+/*
  * BBP 109
  */
 #define BBP109_TX0_POWER                FIELD8(0x0f)