summaryrefslogtreecommitdiffstats
path: root/include/linux/clk.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-05-11 17:13:00 +0200
committerArnd Bergmann <arnd@arndb.de>2012-05-11 17:13:00 +0200
commite12ff34402bd3a6cbeab0423012066874bb10f4b (patch)
tree026668e3c64638ff8cc367d5a43269b2949a2549 /include/linux/clk.h
parentbef945965884365cdc49985169977a51390253f1 (diff)
parente9d7f4065408e92338a41b809e437c6e043da090 (diff)
downloadlinux-stable-e12ff34402bd3a6cbeab0423012066874bb10f4b.tar.gz
linux-stable-e12ff34402bd3a6cbeab0423012066874bb10f4b.tar.bz2
linux-stable-e12ff34402bd3a6cbeab0423012066874bb10f4b.zip
Merge branch 'depends/rmk/clkdev' into next/clock
* depends/rmk/clkdev: CLKDEV: provide helpers for common clock framework ARM: 7392/1: CLKDEV: Optimize clk_find() ARM: 7376/1: clkdev: Implement managed clk_get()
Diffstat (limited to 'include/linux/clk.h')
-rw-r--r--include/linux/clk.h32
1 files changed, 32 insertions, 0 deletions
diff --git a/include/linux/clk.h b/include/linux/clk.h
index 0e078bdec09f..ad5c43e8ae8a 100644
--- a/include/linux/clk.h
+++ b/include/linux/clk.h
@@ -101,6 +101,26 @@ int clk_notifier_unregister(struct clk *clk, struct notifier_block *nb);
struct clk *clk_get(struct device *dev, const char *id);
/**
+ * devm_clk_get - lookup and obtain a managed reference to a clock producer.
+ * @dev: device for clock "consumer"
+ * @id: clock comsumer ID
+ *
+ * Returns a struct clk corresponding to the clock producer, or
+ * valid IS_ERR() condition containing errno. The implementation
+ * uses @dev and @id to determine the clock consumer, and thereby
+ * the clock producer. (IOW, @id may be identical strings, but
+ * clk_get may return different clock producers depending on @dev.)
+ *
+ * Drivers must assume that the clock source is not enabled.
+ *
+ * devm_clk_get should not be called from within interrupt context.
+ *
+ * The clock will automatically be freed when the device is unbound
+ * from the bus.
+ */
+struct clk *devm_clk_get(struct device *dev, const char *id);
+
+/**
* clk_prepare - prepare a clock source
* @clk: clock source
*
@@ -206,6 +226,18 @@ unsigned long clk_get_rate(struct clk *clk);
*/
void clk_put(struct clk *clk);
+/**
+ * devm_clk_put - "free" a managed clock source
+ * @dev: device used to acuqire the clock
+ * @clk: clock source acquired with devm_clk_get()
+ *
+ * Note: drivers must ensure that all clk_enable calls made on this
+ * clock source are balanced by clk_disable calls prior to calling
+ * this function.
+ *
+ * clk_put should not be called from within interrupt context.
+ */
+void devm_clk_put(struct device *dev, struct clk *clk);
/*
* The remaining APIs are optional for machine class support.