bcma: allow setting FAST clockmode for a core

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/bcma/core.c b/drivers/bcma/core.c
index 1ec7d4528dd0d823d4beaf2190575b28755c556b..0686b1b5f27a6b4901854415d0eaa2dfb18a6f9f 100644 (file)
--- a/drivers/bcma/core.c
+++ b/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/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h
index 6e5dc7b3c02404a9485d3bff396276d812a6e266..37017c1cc6b718587bce72697ad19c005d156090 100644 (file)
--- a/include/linux/bcma/bcma.h
+++ b/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_ */