blob: 76039be888a1b581d4603308a8b6625d8765b051 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
Revert "wl18xx: do not invert IRQ on WLxxxx side"
This reverts commit 2bcfc394307ae164cbbdff74b902af61dc0181b4.
The hard-coded assumption that the IRQ inversion logic is not
needed breaks non-Kingfisher users, specifically the WLAN card
for the AGL reference hardware board.
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
---
drivers/net/wireless/ti/wl18xx/main.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
index 764987101116..0b3cf8477c6c 100644
--- a/drivers/net/wireless/ti/wl18xx/main.c
+++ b/drivers/net/wireless/ti/wl18xx/main.c
@@ -865,9 +865,7 @@ static int wl18xx_pre_upload(struct wl1271 *wl)
{
u32 tmp;
int ret;
-#if 0
u16 irq_invert;
-#endif
BUILD_BUG_ON(sizeof(struct wl18xx_mac_and_phy_params) >
WL18XX_PHY_INIT_MEM_SIZE);
@@ -920,11 +918,6 @@ static int wl18xx_pre_upload(struct wl1271 *wl)
if (ret < 0)
goto out;
-#if 0
- /* We have level translator with inversion on IRQ line so we
- * set IRQ_TYPE_EDGE_FALLING in DTS, but we do not need to
- * invert IRQ logic on WLxxxx side!
- */
ret = irq_get_trigger_type(wl->irq);
if ((ret == IRQ_TYPE_LEVEL_LOW) || (ret == IRQ_TYPE_EDGE_FALLING)) {
wl1271_info("using inverted interrupt logic: %d", ret);
@@ -944,7 +937,6 @@ static int wl18xx_pre_upload(struct wl1271 *wl)
ret = wlcore_set_partition(wl, &wl->ptable[PART_PHY_INIT]);
}
-#endif
out:
return ret;
|
