History

Merge branches 'pm-sleep', 'pm-domains', 'pm-opp' and 'powercap'

* pm-sleep: PM / wakeirq: remove unnecessary parentheses PM / core: Clean up some function headers in power.h PM / hibernate: memory_bm_find_bit(): Tighten node optimisation * pm-domains: PM / Domains: Convert to dev_to_genpd_safe() in genpd_syscore_switch() mmc: tmio: Avoid boilerplate code in ->runtime_suspend() PM / Domains: Implement the ->start() callback for genpd PM / Domains: Introduce dev_pm_domain_start() * pm-opp: PM / OPP: Support adjusting OPP voltages at runtime * powercap: powercap/intel_rapl: add support for Cometlake desktop powercap/intel_rapl: add support for CometLake Mobile

Rafael J. Wysocki committed 6 years ago

Commit 5a97aa55 parents fa6a599 01ca482 fe0c2ba 16c71c5 f84fdcb12 files · +157 −48Browse files

Showing the changes to include/linux (3 of 12 files). Show all

Unified · Split

3 files
  1. include/linux/pm.h +2 −0
  2. include/linux/pm_domain.h +5 −0
  3. include/linux/pm_opp.h +13 −0
include/linux/pm.h+2−0
@@ -637,6 +637,7 @@ extern void dev_pm_put_subsys_data(struct device *dev); · 636 unmodified lines
637637 * struct dev_pm_domain - power management domain representation.
638638 *
639639 * @ops: Power management operations associated with this domain.
640+ * @start: Called when a user needs to start the device via the domain.
640641 * @detach: Called when removing a device from the domain.
641642 * @activate: Called before executing probe routines for bus types and drivers.
642643 * @sync: Called after successful driver probe.
@@ -648,6 +649,7 @@ extern void dev_pm_put_subsys_data(struct device *dev); · 5 unmodified lines
648649 */
649650 struct dev_pm_domain {
650651 struct dev_pm_ops ops;
652+ int (*start)(struct device *dev);
651653 void (*detach)(struct device *dev, bool power_off);
652654 int (*activate)(struct device *dev);
653655 void (*sync)(struct device *dev);
include/linux/pm_domain.h+5−0
@@ -366,6 +366,7 @@ struct device *dev_pm_domain_attach_by_id(struct device *dev, · 365 unmodified lines
366366 struct device *dev_pm_domain_attach_by_name(struct device *dev,
367367 const char *name);
368368 void dev_pm_domain_detach(struct device *dev, bool power_off);
369+int dev_pm_domain_start(struct device *dev);
369370 void dev_pm_domain_set(struct device *dev, struct dev_pm_domain *pd);
370371 #else
371372 static inline int dev_pm_domain_attach(struct device *dev, bool power_on)
@@ -383,6 +384,10 @@ static inline struct device *dev_pm_domain_attach_by_name(struct device *dev, · 11 unmodified lines
383384 return NULL;
384385 }
385386 static inline void dev_pm_domain_detach(struct device *dev, bool power_off) {}
387+static inline int dev_pm_domain_start(struct device *dev)
388+{
389+ return 0;
390+}
386391 static inline void dev_pm_domain_set(struct device *dev,
387392 struct dev_pm_domain *pd) {}
388393 #endif
include/linux/pm_opp.h+13−0
@@ -22,6 +22,7 @@ struct opp_table; · 21 unmodified lines
2222
2323 enum dev_pm_opp_event {
2424 OPP_EVENT_ADD, OPP_EVENT_REMOVE, OPP_EVENT_ENABLE, OPP_EVENT_DISABLE,
25+ OPP_EVENT_ADJUST_VOLTAGE,
2526 };
2627
2728 /**
@@ -113,6 +114,10 @@ int dev_pm_opp_add(struct device *dev, unsigned long freq, · 85 unmodified lines
113114 void dev_pm_opp_remove(struct device *dev, unsigned long freq);
114115 void dev_pm_opp_remove_all_dynamic(struct device *dev);
115116
117+int dev_pm_opp_adjust_voltage(struct device *dev, unsigned long freq,
118+ unsigned long u_volt, unsigned long u_volt_min,
119+ unsigned long u_volt_max);
120+
116121 int dev_pm_opp_enable(struct device *dev, unsigned long freq);
117122
118123 int dev_pm_opp_disable(struct device *dev, unsigned long freq);
@@ -242,6 +247,14 @@ static inline void dev_pm_opp_remove_all_dynamic(struct device *dev) · 123 unmodified lines
242247 {
243248 }
244249
250+static inline int
251+dev_pm_opp_adjust_voltage(struct device *dev, unsigned long freq,
252+ unsigned long u_volt, unsigned long u_volt_min,
253+ unsigned long u_volt_max)
254+{
255+ return 0;
256+}
257+
245258 static inline int dev_pm_opp_enable(struct device *dev, unsigned long freq)
246259 {
247260 return 0;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t