Skip to content

Commit

Permalink
wl12xx: 1281/1283 support - move IRQ polarity
Browse files Browse the repository at this point in the history
In order to prevent overran of IRQ polarity via FW the polarity setting move after
FW download and before IRQ enable.

Signed-off-by: Shahar Levi <shahar_levi@ti.com>
Reviewed-by: Luciano Coelho <coelho@ti.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
  • Loading branch information
Shahar Levi authored and Luciano Coelho committed Apr 19, 2011
1 parent 62c7d08 commit b9b0fde
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions drivers/net/wireless/wl12xx/boot.c
Original file line number Diff line number Diff line change
Expand Up @@ -585,13 +585,6 @@ int wl1271_load_firmware(struct wl1271 *wl)
/* 6. read the EEPROM parameters */
tmp = wl1271_read32(wl, SCR_PAD2);

ret = wl1271_boot_write_irq_polarity(wl);
if (ret < 0)
goto out;

wl1271_write32(wl, ACX_REG_INTERRUPT_MASK,
WL1271_ACX_ALL_EVENTS_VECTOR);

/* WL1271: The reference driver skips steps 7 to 10 (jumps directly
* to upload_fw) */

Expand All @@ -618,6 +611,13 @@ int wl1271_boot(struct wl1271 *wl)
if (ret < 0)
goto out;

ret = wl1271_boot_write_irq_polarity(wl);
if (ret < 0)
goto out;

wl1271_write32(wl, ACX_REG_INTERRUPT_MASK,
WL1271_ACX_ALL_EVENTS_VECTOR);

/* Enable firmware interrupts now */
wl1271_boot_enable_interrupts(wl);

Expand Down

0 comments on commit b9b0fde

Please sign in to comment.