diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-11-29 01:18:27 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-11-29 01:18:27 +0100 |
| commit | ef9cc993cd2e3524d86e86e9ad510e8f34b9c078 (patch) | |
| tree | 4596a532436b30268c493377a4cd0bde658ce159 /include/linux | |
| parent | af261127e94c286c08bba162711307863fd4e68c (diff) | |
| parent | 471f7707b6f0b18b6aa81119ed01525d9e712427 (diff) | |
| download | linux-stable-ef9cc993cd2e3524d86e86e9ad510e8f34b9c078.tar.gz linux-stable-ef9cc993cd2e3524d86e86e9ad510e8f34b9c078.tar.bz2 linux-stable-ef9cc993cd2e3524d86e86e9ad510e8f34b9c078.zip | |
Merge branch 'pm-clk' into pm-runtime
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pm_clock.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/pm_clock.h b/include/linux/pm_clock.h index 8348866e7b05..0b0039634410 100644 --- a/include/linux/pm_clock.h +++ b/include/linux/pm_clock.h @@ -18,6 +18,8 @@ struct pm_clk_notifier_block { char *con_ids[]; }; +struct clk; + #ifdef CONFIG_PM_CLK static inline bool pm_clk_no_clocks(struct device *dev) { @@ -29,6 +31,7 @@ extern void pm_clk_init(struct device *dev); extern int pm_clk_create(struct device *dev); extern void pm_clk_destroy(struct device *dev); extern int pm_clk_add(struct device *dev, const char *con_id); +extern int pm_clk_add_clk(struct device *dev, struct clk *clk); extern void pm_clk_remove(struct device *dev, const char *con_id); extern int pm_clk_suspend(struct device *dev); extern int pm_clk_resume(struct device *dev); @@ -51,6 +54,11 @@ static inline int pm_clk_add(struct device *dev, const char *con_id) { return -EINVAL; } + +static inline int pm_clk_add_clk(struct device *dev, struct clk *clk) +{ + return -EINVAL; +} static inline void pm_clk_remove(struct device *dev, const char *con_id) { } |