diff options
author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2010-01-12 18:23:04 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-01-14 18:16:54 -0500 |
commit | ececeecee8c60be96368bcc416057f38822012df (patch) | |
tree | b8b6943d7114a46ab1475b64f9704ffb5c644c85 /drivers | |
parent | c2f4f527edab37f2f2130bd7813cd41db907ab6b (diff) |
wl1271: remove unused flags
These are unused and as with a previous patch 5ef5da for wl1251
this removes some other unused flags. the IRQ_MASK specifically
conflicts with include/pcmcia/cs.h when using compat-wireless.
Cc: Kalle Valo <kalle.valo@nokia.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_reg.h | 99 |
1 files changed, 0 insertions, 99 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_reg.h b/drivers/net/wireless/wl12xx/wl1271_reg.h index 1f237389d1c7..990960771528 100644 --- a/drivers/net/wireless/wl12xx/wl1271_reg.h +++ b/drivers/net/wireless/wl12xx/wl1271_reg.h | |||
@@ -62,73 +62,10 @@ | |||
62 | #define WL1271_SLV_REG_DATA (REGISTERS_BASE + 0x0008) | 62 | #define WL1271_SLV_REG_DATA (REGISTERS_BASE + 0x0008) |
63 | #define WL1271_SLV_REG_ADATA (REGISTERS_BASE + 0x000c) | 63 | #define WL1271_SLV_REG_ADATA (REGISTERS_BASE + 0x000c) |
64 | #define WL1271_SLV_MEM_DATA (REGISTERS_BASE + 0x0018) | 64 | #define WL1271_SLV_MEM_DATA (REGISTERS_BASE + 0x0018) |
65 | /* | ||
66 | * Interrupt registers. | ||
67 | * 64 bit interrupt sources registers ws ced. | ||
68 | * sme interupts were removed and new ones were added. | ||
69 | * Order was changed. | ||
70 | */ | ||
71 | #define FIQ_MASK (REGISTERS_BASE + 0x0400) | ||
72 | #define FIQ_MASK_L (REGISTERS_BASE + 0x0400) | ||
73 | #define FIQ_MASK_H (REGISTERS_BASE + 0x0404) | ||
74 | #define FIQ_MASK_SET (REGISTERS_BASE + 0x0408) | ||
75 | #define FIQ_MASK_SET_L (REGISTERS_BASE + 0x0408) | ||
76 | #define FIQ_MASK_SET_H (REGISTERS_BASE + 0x040C) | ||
77 | #define FIQ_MASK_CLR (REGISTERS_BASE + 0x0410) | ||
78 | #define FIQ_MASK_CLR_L (REGISTERS_BASE + 0x0410) | ||
79 | #define FIQ_MASK_CLR_H (REGISTERS_BASE + 0x0414) | ||
80 | #define IRQ_MASK (REGISTERS_BASE + 0x0418) | ||
81 | #define IRQ_MASK_L (REGISTERS_BASE + 0x0418) | ||
82 | #define IRQ_MASK_H (REGISTERS_BASE + 0x041C) | ||
83 | #define IRQ_MASK_SET (REGISTERS_BASE + 0x0420) | ||
84 | #define IRQ_MASK_SET_L (REGISTERS_BASE + 0x0420) | ||
85 | #define IRQ_MASK_SET_H (REGISTERS_BASE + 0x0424) | ||
86 | #define IRQ_MASK_CLR (REGISTERS_BASE + 0x0428) | ||
87 | #define IRQ_MASK_CLR_L (REGISTERS_BASE + 0x0428) | ||
88 | #define IRQ_MASK_CLR_H (REGISTERS_BASE + 0x042C) | ||
89 | #define ECPU_MASK (REGISTERS_BASE + 0x0448) | ||
90 | #define FIQ_STS_L (REGISTERS_BASE + 0x044C) | ||
91 | #define FIQ_STS_H (REGISTERS_BASE + 0x0450) | ||
92 | #define IRQ_STS_L (REGISTERS_BASE + 0x0454) | ||
93 | #define IRQ_STS_H (REGISTERS_BASE + 0x0458) | ||
94 | #define INT_STS_ND (REGISTERS_BASE + 0x0464) | ||
95 | #define INT_STS_RAW_L (REGISTERS_BASE + 0x0464) | ||
96 | #define INT_STS_RAW_H (REGISTERS_BASE + 0x0468) | ||
97 | #define INT_STS_CLR (REGISTERS_BASE + 0x04B4) | ||
98 | #define INT_STS_CLR_L (REGISTERS_BASE + 0x04B4) | ||
99 | #define INT_STS_CLR_H (REGISTERS_BASE + 0x04B8) | ||
100 | #define INT_ACK (REGISTERS_BASE + 0x046C) | ||
101 | #define INT_ACK_L (REGISTERS_BASE + 0x046C) | ||
102 | #define INT_ACK_H (REGISTERS_BASE + 0x0470) | ||
103 | #define INT_TRIG (REGISTERS_BASE + 0x0474) | ||
104 | #define INT_TRIG_L (REGISTERS_BASE + 0x0474) | ||
105 | #define INT_TRIG_H (REGISTERS_BASE + 0x0478) | ||
106 | #define HOST_STS_L (REGISTERS_BASE + 0x045C) | ||
107 | #define HOST_STS_H (REGISTERS_BASE + 0x0460) | ||
108 | #define HOST_MASK (REGISTERS_BASE + 0x0430) | ||
109 | #define HOST_MASK_L (REGISTERS_BASE + 0x0430) | ||
110 | #define HOST_MASK_H (REGISTERS_BASE + 0x0434) | ||
111 | #define HOST_MASK_SET (REGISTERS_BASE + 0x0438) | ||
112 | #define HOST_MASK_SET_L (REGISTERS_BASE + 0x0438) | ||
113 | #define HOST_MASK_SET_H (REGISTERS_BASE + 0x043C) | ||
114 | #define HOST_MASK_CLR (REGISTERS_BASE + 0x0440) | ||
115 | #define HOST_MASK_CLR_L (REGISTERS_BASE + 0x0440) | ||
116 | #define HOST_MASK_CLR_H (REGISTERS_BASE + 0x0444) | ||
117 | 65 | ||
118 | #define ACX_REG_INTERRUPT_TRIG (REGISTERS_BASE + 0x0474) | 66 | #define ACX_REG_INTERRUPT_TRIG (REGISTERS_BASE + 0x0474) |
119 | #define ACX_REG_INTERRUPT_TRIG_H (REGISTERS_BASE + 0x0478) | 67 | #define ACX_REG_INTERRUPT_TRIG_H (REGISTERS_BASE + 0x0478) |
120 | 68 | ||
121 | /* Host Interrupts*/ | ||
122 | #define HINT_MASK (REGISTERS_BASE + 0x0494) | ||
123 | #define HINT_MASK_SET (REGISTERS_BASE + 0x0498) | ||
124 | #define HINT_MASK_CLR (REGISTERS_BASE + 0x049C) | ||
125 | #define HINT_STS_ND_MASKED (REGISTERS_BASE + 0x04A0) | ||
126 | /*1150 spec calls this HINT_STS_RAW*/ | ||
127 | #define HINT_STS_ND (REGISTERS_BASE + 0x04B0) | ||
128 | #define HINT_STS_CLR (REGISTERS_BASE + 0x04A4) | ||
129 | #define HINT_ACK (REGISTERS_BASE + 0x04A8) | ||
130 | #define HINT_TRIG (REGISTERS_BASE + 0x04AC) | ||
131 | |||
132 | /*============================================= | 69 | /*============================================= |
133 | Host Interrupt Mask Register - 32bit (RW) | 70 | Host Interrupt Mask Register - 32bit (RW) |
134 | ------------------------------------------ | 71 | ------------------------------------------ |
@@ -433,16 +370,6 @@ | |||
433 | 370 | ||
434 | 371 | ||
435 | /*=============================================== | 372 | /*=============================================== |
436 | Phy regs | ||
437 | ===============================================*/ | ||
438 | #define ACX_PHY_ADDR_REG SBB_ADDR | ||
439 | #define ACX_PHY_DATA_REG SBB_DATA | ||
440 | #define ACX_PHY_CTRL_REG SBB_CTL | ||
441 | #define ACX_PHY_REG_WR_MASK 0x00000001ul | ||
442 | #define ACX_PHY_REG_RD_MASK 0x00000002ul | ||
443 | |||
444 | |||
445 | /*=============================================== | ||
446 | EEPROM Read/Write Request 32bit RW | 373 | EEPROM Read/Write Request 32bit RW |
447 | ------------------------------------------ | 374 | ------------------------------------------ |
448 | 1 EE_READ - EEPROM Read Request 1 - Setting this bit | 375 | 1 EE_READ - EEPROM Read Request 1 - Setting this bit |
@@ -511,28 +438,6 @@ | |||
511 | #define ACX_CONT_WIND_MIN_MASK 0x0000007f | 438 | #define ACX_CONT_WIND_MIN_MASK 0x0000007f |
512 | #define ACX_CONT_WIND_MAX 0x03ff0000 | 439 | #define ACX_CONT_WIND_MAX 0x03ff0000 |
513 | 440 | ||
514 | /* | ||
515 | * Indirect slave register/memory registers | ||
516 | * ---------------------------------------- | ||
517 | */ | ||
518 | #define HW_SLAVE_REG_ADDR_REG 0x00000004 | ||
519 | #define HW_SLAVE_REG_DATA_REG 0x00000008 | ||
520 | #define HW_SLAVE_REG_CTRL_REG 0x0000000c | ||
521 | |||
522 | #define SLAVE_AUTO_INC 0x00010000 | ||
523 | #define SLAVE_NO_AUTO_INC 0x00000000 | ||
524 | #define SLAVE_HOST_LITTLE_ENDIAN 0x00000000 | ||
525 | |||
526 | #define HW_SLAVE_MEM_ADDR_REG SLV_MEM_ADDR | ||
527 | #define HW_SLAVE_MEM_DATA_REG SLV_MEM_DATA | ||
528 | #define HW_SLAVE_MEM_CTRL_REG SLV_MEM_CTL | ||
529 | #define HW_SLAVE_MEM_ENDIAN_REG SLV_END_CTL | ||
530 | |||
531 | #define HW_FUNC_EVENT_INT_EN 0x8000 | ||
532 | #define HW_FUNC_EVENT_MASK_REG 0x00000034 | ||
533 | |||
534 | #define ACX_MAC_TIMESTAMP_REG (MAC_TIMESTAMP) | ||
535 | |||
536 | /*=============================================== | 441 | /*=============================================== |
537 | HI_CFG Interface Configuration Register Values | 442 | HI_CFG Interface Configuration Register Values |
538 | ------------------------------------------ | 443 | ------------------------------------------ |
@@ -647,10 +552,6 @@ b12-b0 - Supported Rate indicator bits as defined below. | |||
647 | ******************************************************************************/ | 552 | ******************************************************************************/ |
648 | 553 | ||
649 | 554 | ||
650 | #define TNETW1251_CHIP_ID_PG1_0 0x07010101 | ||
651 | #define TNETW1251_CHIP_ID_PG1_1 0x07020101 | ||
652 | #define TNETW1251_CHIP_ID_PG1_2 0x07030101 | ||
653 | |||
654 | /************************************************************************* | 555 | /************************************************************************* |
655 | 556 | ||
656 | Interrupt Trigger Register (Host -> WiLink) | 557 | Interrupt Trigger Register (Host -> WiLink) |