diff options
| author | Shahar Levi <shahar_levi@ti.com> | 2011-03-06 16:32:06 +0200 |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2011-04-19 16:19:45 +0300 |
| commit | b9b0fdead0e8d964a534e5b09f40d8bd4bf7dfe8 (patch) | |
| tree | 37da441b5edb8940f34bd732fd357625a65f8ca2 | |
| parent | 62c7d085e1f2a1f2b4d89560551eff18d703b3b1 (diff) | |
| download | talos-obmc-linux-b9b0fdead0e8d964a534e5b09f40d8bd4bf7dfe8.tar.gz talos-obmc-linux-b9b0fdead0e8d964a534e5b09f40d8bd4bf7dfe8.zip | |
wl12xx: 1281/1283 support - move IRQ polarity
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>
| -rw-r--r-- | drivers/net/wireless/wl12xx/boot.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/wl12xx/boot.c b/drivers/net/wireless/wl12xx/boot.c index 6934dffd5174..69fe8703be42 100644 --- a/drivers/net/wireless/wl12xx/boot.c +++ b/drivers/net/wireless/wl12xx/boot.c @@ -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) */ @@ -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); |
