From 5d4ed6ae499a170a47533e4158960b1ea72d01eb Mon Sep 17 00:00:00 2001
From: Gery Kahn <geryk@ti.com>
Date: Tue, 5 Oct 2010 16:09:05 +0200
Subject: [PATCH] --- yaml --- r: 224251 b: refs/heads/master c:
 c8aea565e8f715d9f10064b1cbfbc15bf75df501 h: refs/heads/master i:   224249:
 b8fe2a3298e7bfd796054af6eb968d125f63c8bc   224247:
 a65e85c2c0b05c48d15a8c4545aad79126cc39b8 v: v3

---
 [refs]                                          |  2 +-
 trunk/drivers/net/wireless/wl12xx/wl1271_boot.c | 10 ++++------
 trunk/include/linux/wl12xx.h                    |  8 ++++++++
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 30bfd1333539..f39bc65aa876 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34d59c07e9ad7130813c28f8554ef1298af923b7
+refs/heads/master: c8aea565e8f715d9f10064b1cbfbc15bf75df501
diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_boot.c b/trunk/drivers/net/wireless/wl12xx/wl1271_boot.c
index b91021242098..5b190728ca55 100644
--- a/trunk/drivers/net/wireless/wl12xx/wl1271_boot.c
+++ b/trunk/drivers/net/wireless/wl12xx/wl1271_boot.c
@@ -471,20 +471,19 @@ int wl1271_boot(struct wl1271 *wl)
 {
 	int ret = 0;
 	u32 tmp, clk, pause;
-	int ref_clock = wl->ref_clock;
 
 	wl1271_boot_hw_version(wl);
 
-	if (ref_clock == 0 || ref_clock == 2 || ref_clock == 4)
+	if (wl->ref_clock == 0 || wl->ref_clock == 2 || wl->ref_clock == 4)
 		/* ref clk: 19.2/38.4/38.4-XTAL */
 		clk = 0x3;
-	else if (ref_clock == 1 || ref_clock == 3)
+	else if (wl->ref_clock == 1 || wl->ref_clock == 3)
 		/* ref clk: 26/52 */
 		clk = 0x5;
 	else
 		return -EINVAL;
 
-	if (ref_clock != 0) {
+	if (wl->ref_clock != 0) {
 		u16 val;
 		/* Set clock type (open drain) */
 		val = wl1271_top_reg_read(wl, OCP_REG_CLK_TYPE);
@@ -529,8 +528,7 @@ int wl1271_boot(struct wl1271 *wl)
 
 	wl1271_debug(DEBUG_BOOT, "clk2 0x%x", clk);
 
-	/* 2 */
-	clk |= (ref_clock << 1) << 4;
+	clk |= (wl->ref_clock << 1) << 4;
 	wl1271_write32(wl, DRPW_SCRATCH_START, clk);
 
 	wl1271_set_partition(wl, &part_table[PART_WORK]);
diff --git a/trunk/include/linux/wl12xx.h b/trunk/include/linux/wl12xx.h
index 4f902e1908aa..bebb8efea0a6 100644
--- a/trunk/include/linux/wl12xx.h
+++ b/trunk/include/linux/wl12xx.h
@@ -24,6 +24,14 @@
 #ifndef _LINUX_WL12XX_H
 #define _LINUX_WL12XX_H
 
+/* The board reference clock values */
+enum {
+	WL12XX_REFCLOCK_19 = 0,	/* 19.2 MHz */
+	WL12XX_REFCLOCK_26 = 1,	/* 26 MHz */
+	WL12XX_REFCLOCK_38 = 2,	/* 38.4 MHz */
+	WL12XX_REFCLOCK_54 = 3,	/* 54 MHz */
+};
+
 struct wl12xx_platform_data {
 	void (*set_power)(bool enable);
 	/* SDIO only: IRQ number if WLAN_IRQ line is used, 0 for SDIO IRQs */