1 files changed, 45 insertions, 6 deletions

diff --git a/drivers/net/wireless/wl12xx/init.c b/drivers/net/wireless/wl12xx/init.c
index 6072fe457135..ab3b1e21de29 100644
--- a/drivers/net/wireless/wl12xx/init.c
+++ b/drivers/net/wireless/wl12xx/init.c
@@ -31,6 +31,7 @@
 #include "cmd.h"
 #include "reg.h"
 #include "tx.h"
+#include "io.h"
 
 int wl1271_sta_init_templates_config(struct wl1271 *wl)
 {
@@ -321,9 +322,11 @@ static int wl1271_sta_hw_init(struct wl1271 *wl)
 {
         int ret;
 
-        ret = wl1271_cmd_ext_radio_parms(wl);
-        if (ret < 0)
-                return ret;
+        if (wl->chip.id != CHIP_ID_1283_PG20) {
+                ret = wl1271_cmd_ext_radio_parms(wl);
+                if (ret < 0)
+                        return ret;
+        }
 
         /* PS config */
         ret = wl1271_acx_config_ps(wl);
@@ -372,6 +375,10 @@ static int wl1271_sta_hw_init(struct wl1271 *wl)
         if (ret < 0)
                 return ret;
 
+        ret = wl1271_acx_sta_max_tx_retry(wl);
+        if (ret < 0)
+                return ret;
+
         ret = wl1271_acx_sta_mem_cfg(wl);
         if (ret < 0)
                 return ret;
@@ -438,7 +445,7 @@ static int wl1271_ap_hw_init(struct wl1271 *wl)
         if (ret < 0)
                 return ret;
 
-        ret = wl1271_acx_max_tx_retry(wl);
+        ret = wl1271_acx_ap_max_tx_retry(wl);
         if (ret < 0)
                 return ret;
 
@@ -504,6 +511,27 @@ static int wl1271_set_ba_policies(struct wl1271 *wl)
         return ret;
 }
 
+int wl1271_chip_specific_init(struct wl1271 *wl)
+{
+        int ret = 0;
+
+        if (wl->chip.id == CHIP_ID_1283_PG20) {
+                u32 host_cfg_bitmap = HOST_IF_CFG_RX_FIFO_ENABLE;
+
+                if (wl->quirks & WL12XX_QUIRK_BLOCKSIZE_ALIGNMENT)
+                        /* Enable SDIO padding */
+                        host_cfg_bitmap |= HOST_IF_CFG_TX_PAD_TO_SDIO_BLK;
+
+                /* Must be before wl1271_acx_init_mem_config() */
+                ret = wl1271_acx_host_if_cfg_bitmap(wl, host_cfg_bitmap);
+                if (ret < 0)
+                        goto out;
+        }
+out:
+        return ret;
+}
+
+
 int wl1271_hw_init(struct wl1271 *wl)
 {
         struct conf_tx_ac_category *conf_ac;
@@ -511,11 +539,22 @@ int wl1271_hw_init(struct wl1271 *wl)
         int ret, i;
         bool is_ap = (wl->bss_type == BSS_TYPE_AP_BSS);
 
-        ret = wl1271_cmd_general_parms(wl);
+        if (wl->chip.id == CHIP_ID_1283_PG20)
+                ret = wl128x_cmd_general_parms(wl);
+        else
+                ret = wl1271_cmd_general_parms(wl);
+        if (ret < 0)
+                return ret;
+
+        if (wl->chip.id == CHIP_ID_1283_PG20)
+                ret = wl128x_cmd_radio_parms(wl);
+        else
+                ret = wl1271_cmd_radio_parms(wl);
         if (ret < 0)
                 return ret;
 
-        ret = wl1271_cmd_radio_parms(wl);
+        /* Chip-specific init */
+        ret = wl1271_chip_specific_init(wl);
         if (ret < 0)
                 return ret;