From f5eaa9749e0697e92e9784587a34a1b38cf0f07b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
Date: Sun, 17 Jul 2011 01:06:04 +0200
Subject: [PATCH] --- yaml --- r: 258503 b: refs/heads/master c:
 7424dd0d03502b9844b96bf6efd0716b79c36607 h: refs/heads/master i:   258501:
 45d828eb6586b7154235a390eee4fb196d10622b   258499:
 7ab1b3b25e18a9cb7facb1e521ba6df5dce5c636   258495:
 afa884cf93535ef837ca576f9e7ea47251e0d00b v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/bcma/core.c       | 31 +++++++++++++++++++++++++++++++
 trunk/include/linux/bcma/bcma.h |  8 +++++++-
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 63020c1a544c..e22f2f053ee3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3de1a7748f68c63daed7c9e04ac9f048efcd9f20
+refs/heads/master: 7424dd0d03502b9844b96bf6efd0716b79c36607
diff --git a/trunk/drivers/bcma/core.c b/trunk/drivers/bcma/core.c
index 1ec7d4528dd0..0686b1b5f27a 100644
--- a/trunk/drivers/bcma/core.c
+++ b/trunk/drivers/bcma/core.c
@@ -50,3 +50,34 @@ int bcma_core_enable(struct bcma_device *core, u32 flags)
 	return 0;
 }
 EXPORT_SYMBOL_GPL(bcma_core_enable);
+
+void bcma_core_set_clockmode(struct bcma_device *core,
+			     enum bcma_clkmode clkmode)
+{
+	u16 i;
+
+	WARN_ON(core->id.id != BCMA_CORE_CHIPCOMMON &&
+		core->id.id != BCMA_CORE_PCIE &&
+		core->id.id != BCMA_CORE_80211);
+
+	switch (clkmode) {
+	case BCMA_CLKMODE_FAST:
+		bcma_set32(core, BCMA_CLKCTLST, BCMA_CLKCTLST_FORCEHT);
+		udelay(64);
+		for (i = 0; i < 1500; i++) {
+			if (bcma_read32(core, BCMA_CLKCTLST) &
+			    BCMA_CLKCTLST_HAVEHT) {
+				i = 0;
+				break;
+			}
+			udelay(10);
+		}
+		if (i)
+			pr_err("HT force timeout\n");
+		break;
+	case BCMA_CLKMODE_DYNAMIC:
+		pr_warn("Dynamic clockmode not supported yet!\n");
+		break;
+	}
+}
+EXPORT_SYMBOL_GPL(bcma_core_set_clockmode);
diff --git a/trunk/include/linux/bcma/bcma.h b/trunk/include/linux/bcma/bcma.h
index 6e5dc7b3c024..37017c1cc6b7 100644
--- a/trunk/include/linux/bcma/bcma.h
+++ b/trunk/include/linux/bcma/bcma.h
@@ -25,6 +25,11 @@ struct bcma_chipinfo {
 	u8 pkg;
 };
 
+enum bcma_clkmode {
+	BCMA_CLKMODE_FAST,
+	BCMA_CLKMODE_DYNAMIC,
+};
+
 struct bcma_host_ops {
 	u8 (*read8)(struct bcma_device *core, u16 offset);
 	u16 (*read16)(struct bcma_device *core, u16 offset);
@@ -253,6 +258,7 @@ void bcma_awrite32(struct bcma_device *core, u16 offset, u32 value)
 extern bool bcma_core_is_enabled(struct bcma_device *core);
 extern void bcma_core_disable(struct bcma_device *core, u32 flags);
 extern int bcma_core_enable(struct bcma_device *core, u32 flags);
-
+extern void bcma_core_set_clockmode(struct bcma_device *core,
+				    enum bcma_clkmode clkmode);
 
 #endif /* LINUX_BCMA_H_ */