aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2013-03-12 15:26:02 -0400
committerMike Turquette <mturquette@linaro.org>2013-03-19 15:58:42 -0400
commit3d6ee287a3e341c88eafd0b4620b12d640b3736b (patch)
treec5361658171613baf2437e14ac27563a43241bd3 /include/linux
parent30ee400614385ac49f4c9b4bc03d77ff8f07a61e (diff)
clk: Introduce optional is_prepared callback
To reflect whether a clk_hw is prepared the clk_hw may implement the optional is_prepared callback. If not implemented we fall back to use the software prepare counter. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/clk-provider.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index 7f197d7addb0..ee946862e058 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -45,6 +45,10 @@ struct clk_hw;
45 * undo any work done in the @prepare callback. Called with 45 * undo any work done in the @prepare callback. Called with
46 * prepare_lock held. 46 * prepare_lock held.
47 * 47 *
48 * @is_prepared: Queries the hardware to determine if the clock is prepared.
49 * This function is allowed to sleep. Optional, if this op is not
50 * set then the prepare count will be used.
51 *
48 * @enable: Enable the clock atomically. This must not return until the 52 * @enable: Enable the clock atomically. This must not return until the
49 * clock is generating a valid clock signal, usable by consumer 53 * clock is generating a valid clock signal, usable by consumer
50 * devices. Called with enable_lock held. This function must not 54 * devices. Called with enable_lock held. This function must not
@@ -108,6 +112,7 @@ struct clk_hw;
108struct clk_ops { 112struct clk_ops {
109 int (*prepare)(struct clk_hw *hw); 113 int (*prepare)(struct clk_hw *hw);
110 void (*unprepare)(struct clk_hw *hw); 114 void (*unprepare)(struct clk_hw *hw);
115 int (*is_prepared)(struct clk_hw *hw);
111 int (*enable)(struct clk_hw *hw); 116 int (*enable)(struct clk_hw *hw);
112 void (*disable)(struct clk_hw *hw); 117 void (*disable)(struct clk_hw *hw);
113 int (*is_enabled)(struct clk_hw *hw); 118 int (*is_enabled)(struct clk_hw *hw);
@@ -351,6 +356,7 @@ unsigned int __clk_get_enable_count(struct clk *clk);
351unsigned int __clk_get_prepare_count(struct clk *clk); 356unsigned int __clk_get_prepare_count(struct clk *clk);
352unsigned long __clk_get_rate(struct clk *clk); 357unsigned long __clk_get_rate(struct clk *clk);
353unsigned long __clk_get_flags(struct clk *clk); 358unsigned long __clk_get_flags(struct clk *clk);
359bool __clk_is_prepared(struct clk *clk);
354bool __clk_is_enabled(struct clk *clk); 360bool __clk_is_enabled(struct clk *clk);
355struct clk *__clk_lookup(const char *name); 361struct clk *__clk_lookup(const char *name);
356 362