diff options
| author | Mike Turquette | 2013-12-31 11:35:12 -0800 |
|---|---|---|
| committer | Mike Turquette | 2013-12-31 11:35:12 -0800 |
| commit | dbdf6ff51e3ce13ade5834b0d7d451522fcdb478 (patch) | |
| tree | b5594d70cf4d484101891adbfc01798c14827fa8 /include | |
| parent | 391e3903e63781debc52a0de73f2e922dcc3f602 (diff) | |
| parent | 9ffe29d780dd5f9c662f2c32f8dc64435da726bf (diff) | |
Merge branch 'clk-next-unregister' into clk-next
Conflicts:
drivers/clk/clk.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/clk-private.h | 5 | ||||
| -rw-r--r-- | include/linux/clkdev.h | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/clk-private.h b/include/linux/clk-private.h index 5fb086b06c83..efbf70b9fd84 100644 --- a/include/linux/clk-private.h +++ b/include/linux/clk-private.h @@ -12,6 +12,7 @@ #define __LINUX_CLK_PRIVATE_H #include <linux/clk-provider.h> +#include <linux/kref.h> #include <linux/list.h> /* @@ -25,10 +26,13 @@ #ifdef CONFIG_COMMON_CLK +struct module; + struct clk { const char *name; const struct clk_ops *ops; struct clk_hw *hw; + struct module *owner; struct clk *parent; const char **parent_names; struct clk **parents; @@ -48,6 +52,7 @@ struct clk { #ifdef CONFIG_DEBUG_FS struct dentry *dentry; #endif + struct kref ref; }; /* diff --git a/include/linux/clkdev.h b/include/linux/clkdev.h index a6a6f603103b..94bad77eeb4a 100644 --- a/include/linux/clkdev.h +++ b/include/linux/clkdev.h @@ -43,4 +43,9 @@ int clk_add_alias(const char *, const char *, char *, struct device *); int clk_register_clkdev(struct clk *, const char *, const char *, ...); int clk_register_clkdevs(struct clk *, struct clk_lookup *, size_t); +#ifdef CONFIG_COMMON_CLK +int __clk_get(struct clk *clk); +void __clk_put(struct clk *clk); +#endif + #endif |