diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-12-12 02:47:36 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-12-12 02:47:36 +0100 |
commit | 68435c0d4a2d73a9f758a4b8444d165b686a8b6a (patch) | |
tree | d9dc76860eb499701970d129e67e61817d46a2d6 /include | |
parent | 89b56047f6f9b15fa3e9df3e34fa391835972ab7 (diff) | |
parent | 01fb4d3c39d35b725441e8a9a26b3f3ad67793ed (diff) | |
download | linux-68435c0d4a2d73a9f758a4b8444d165b686a8b6a.tar.gz |
Merge branch 'pm-opp' into pm-cpufreq
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/pm_opp.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h index 9a2e50337af9..95403d2ccaf5 100644 --- a/include/linux/pm_opp.h +++ b/include/linux/pm_opp.h @@ -55,6 +55,11 @@ int dev_pm_opp_enable(struct device *dev, unsigned long freq); int dev_pm_opp_disable(struct device *dev, unsigned long freq); struct srcu_notifier_head *dev_pm_opp_get_notifier(struct device *dev); +int dev_pm_opp_set_supported_hw(struct device *dev, const u32 *versions, + unsigned int count); +void dev_pm_opp_put_supported_hw(struct device *dev); +int dev_pm_opp_set_prop_name(struct device *dev, const char *name); +void dev_pm_opp_put_prop_name(struct device *dev); #else static inline unsigned long dev_pm_opp_get_voltage(struct dev_pm_opp *opp) { @@ -129,6 +134,23 @@ static inline struct srcu_notifier_head *dev_pm_opp_get_notifier( { return ERR_PTR(-EINVAL); } + +static inline int dev_pm_opp_set_supported_hw(struct device *dev, + const u32 *versions, + unsigned int count) +{ + return -EINVAL; +} + +static inline void dev_pm_opp_put_supported_hw(struct device *dev) {} + +static inline int dev_pm_opp_set_prop_name(struct device *dev, const char *name) +{ + return -EINVAL; +} + +static inline void dev_pm_opp_put_prop_name(struct device *dev) {} + #endif /* CONFIG_PM_OPP */ #if defined(CONFIG_PM_OPP) && defined(CONFIG_OF) |