From c2e99d4970cb602b0718ed0578954c504981de49 Mon Sep 17 00:00:00 2001
From: Luciano Coelho <coelho@ti.com>
Date: Fri, 1 Apr 2011 20:48:02 +0300
Subject: [PATCH] --- yaml --- r: 247121 b: refs/heads/master c:
 afb7d3cd805df7a206439a7e7b5d1167d2bb06f6 h: refs/heads/master i:   247119:
 cd053ba5482f5388e23cf9af42e903b6d32f9fcb v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/net/wireless/wl12xx/boot.c |  2 +-
 trunk/drivers/net/wireless/wl12xx/boot.h | 11 +++++++----
 trunk/drivers/net/wireless/wl12xx/conf.h |  1 +
 trunk/drivers/net/wireless/wl12xx/main.c |  1 +
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index bed8b31a6710..cdaf7cd82c77 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6277ed65704d19377b0874618e5f23d64c9e71a6
+refs/heads/master: afb7d3cd805df7a206439a7e7b5d1167d2bb06f6
diff --git a/trunk/drivers/net/wireless/wl12xx/boot.c b/trunk/drivers/net/wireless/wl12xx/boot.c
index b5ec2c2b6f78..2b0cf85788b3 100644
--- a/trunk/drivers/net/wireless/wl12xx/boot.c
+++ b/trunk/drivers/net/wireless/wl12xx/boot.c
@@ -779,7 +779,7 @@ int wl1271_load_firmware(struct wl1271 *wl)
 	 * to upload_fw) */
 
 	if (wl->chip.id == CHIP_ID_1283_PG20)
-		wl1271_top_reg_write(wl, SDIO_IO_DS, HCI_IO_DS_6MA);
+		wl1271_top_reg_write(wl, SDIO_IO_DS, wl->conf.hci_io_ds);
 
 	ret = wl1271_boot_upload_firmware(wl);
 	if (ret < 0)
diff --git a/trunk/drivers/net/wireless/wl12xx/boot.h b/trunk/drivers/net/wireless/wl12xx/boot.h
index d9de64ac1442..e8f8255bbabe 100644
--- a/trunk/drivers/net/wireless/wl12xx/boot.h
+++ b/trunk/drivers/net/wireless/wl12xx/boot.h
@@ -117,10 +117,13 @@ struct wl1271_static_data {
 #define SDIO_IO_DS                   0xd14
 
 /* SDIO/wSPI DS configuration values */
-#define HCI_IO_DS_8MA                0
-#define HCI_IO_DS_4MA                1 /* default */
-#define HCI_IO_DS_6MA                2
-#define HCI_IO_DS_2MA                3
+enum {
+	HCI_IO_DS_8MA = 0,
+	HCI_IO_DS_4MA = 1, /* default */
+	HCI_IO_DS_6MA = 2,
+	HCI_IO_DS_2MA = 3,
+};
+
 /* end PLL configuration algorithm for wl128x */
 
 #endif
diff --git a/trunk/drivers/net/wireless/wl12xx/conf.h b/trunk/drivers/net/wireless/wl12xx/conf.h
index 743bd0beb63b..52269d4d3623 100644
--- a/trunk/drivers/net/wireless/wl12xx/conf.h
+++ b/trunk/drivers/net/wireless/wl12xx/conf.h
@@ -1206,6 +1206,7 @@ struct conf_drv_settings {
 	struct conf_ht_setting ht;
 	struct conf_memory_settings mem_wl127x;
 	struct conf_memory_settings mem_wl128x;
+	u8 hci_io_ds;
 };
 
 #endif
diff --git a/trunk/drivers/net/wireless/wl12xx/main.c b/trunk/drivers/net/wireless/wl12xx/main.c
index a5a5d0133023..732fd21beafb 100644
--- a/trunk/drivers/net/wireless/wl12xx/main.c
+++ b/trunk/drivers/net/wireless/wl12xx/main.c
@@ -319,6 +319,7 @@ static struct conf_drv_settings default_conf = {
 		.min_req_rx_blocks            = 22,
 		.tx_min                       = 27,
 	},
+	.hci_io_ds = HCI_IO_DS_6MA,
 };
 
 static void __wl1271_op_remove_interface(struct wl1271 *wl);