summaryrefslogtreecommitdiffstats
path: root/drivers/base/power
Commit message (Expand)AuthorAgeFilesLines
*---. Merge branches 'pm-clk', 'pm-domains' and 'powercap'Rafael J. Wysocki2015-06-192-18/+67
|\ \ \
| | * | PM / Domains: Skip timings during syscore suspend/resumeGeert Uytterhoeven2015-06-151-16/+26
| | |/
| * | PM / clk: Print acquired clock name in addition to con_idGeert Uytterhoeven2015-06-151-1/+2
| * | PM / clk: Fix clock error check in __pm_clk_add()Geert Uytterhoeven2015-05-191-1/+1
| * | PM / clock_ops: Provide default runtime ops to usersRajendra Nayak2015-05-121-0/+38
| |/
* | Merge branch 'pm-wakeirq'Rafael J. Wysocki2015-06-196-1/+422
|\ \
| * | PM / Wakeirq: Add automated device wake IRQ handlingTony Lindgren2015-05-206-1/+422
| | |
| \ \
*-. | | Merge branches 'pm-sleep' and 'pm-runtime'Rafael J. Wysocki2015-06-193-6/+60
|\ \| | | |_|/ |/| |
| | * PM / Runtime: Update last_busy in rpm_resumeTony Lindgren2015-05-201-0/+1
| |/ |/|
| * PM / sleep: trace_device_pm_callback coverage in dpm_prepare/completeTodd E Brandt2015-06-101-6/+5
| * PM / wakeup: add a dummy wakeup_source to record statisticsJin Qian2015-05-191-0/+36
| * PM / wakeup: validate wakeup source before activating it.Jin Qian2015-05-081-0/+18
|/
* power: wakeup: remove use of seq_printf return valueJoe Perches2015-04-151-9/+7
*-. Merge branches 'pm-sleep' and 'pm-domains'Rafael J. Wysocki2015-04-133-28/+68
|\ \
| | * PM / domains: avoid potential oops in pm_genpd_remove_device()Russell King2015-03-231-3/+1
| | * PM / domains: factor out code to get the generic PM domain from a struct deviceRussell King2015-03-221-14/+32
| | * PM / domains: quieten down generic pm domainsRussell King2015-03-221-4/+4
| | * PM / Domains: Sync runtime PM status with genpd after probeRussell King2015-03-221-0/+12
| |/ |/|
| * Merge back earlier suspend/hibernate material for v4.1.Rafael J. Wysocki2015-04-102-7/+19
|/|
| * PM / sleep: add pm-trace support for suspending phaseZhonghui Fu2015-03-182-7/+19
| |
| \
*-. | Merge branches 'pm-domains' and 'pm-cpufreq'Rafael J. Wysocki2015-03-061-12/+12
|\ \|
| * | PM / Domains: cleanup: rename gpd -> genpd in debugfs interfaceKevin Hilman2015-03-041-12/+12
| |/
* / PM / wakeup: export pm_system_wakeup symbolBoris BREZILLON2015-03-041-0/+1
|/
*-. Merge branches 'pm-cpufreq', 'pm-cpuidle', 'pm-devfreq', 'pm-opp' and 'pm-tools'Rafael J. Wysocki2015-02-132-9/+3
|\ \
| | * PM / OPP / clk: Remove unnecessary OOM messageQuentin Lambert2015-02-122-9/+3
* | | Merge branch 'pm-domains'Rafael J. Wysocki2015-02-102-104/+71
|\ \ \
| * | | PM: Convert dev_pm_put_subsys_data() into a void functionUlf Hansson2015-02-031-10/+4
| * | | PM: Update function header for dev_pm_get_subsys_data()Ulf Hansson2015-02-031-2/+2
| * | | PM / Domains: Handle errors from genpd's ->attach_dev() callbackUlf Hansson2015-02-031-2/+3
| * | | PM / Domains: Re-order initialization of generic_pm_domain_dataUlf Hansson2015-02-031-32/+35
| * | | PM / Domains: Free pm_subsys_data in error path in __pm_genpd_add_device()Ulf Hansson2015-02-031-9/+16
| * | | PM / Domains: Eliminate the mutex for the generic_pm_domain_dataUlf Hansson2015-02-031-23/+14
| * | | PM / Domains: Don't check for an existing device when adding a newUlf Hansson2015-02-031-7/+0
| * | | PM / Domains: Don't allow an existing generic_pm_domain_dataUlf Hansson2015-02-031-8/+12
| * | | PM / Domains: Remove reference counting for the generic_pm_domain_dataUlf Hansson2015-02-031-8/+2
| * | | PM / Domains: Rename __pm_genpd_alloc|free_dev_data()Ulf Hansson2015-02-031-6/+6
| * | | PM / Domains: Remove pm_genpd_dev_need_restore() APIUlf Hansson2015-01-231-20/+0
| |/ /
| | |
| \ \
*-. \ \ Merge branches 'pm-qos', 'pm-opp' and 'pm-devfreq'Rafael J. Wysocki2015-02-102-44/+154
|\ \ \ \ | |_|/ / |/| | / | | |/
| | * PM / OPP: Assert RCU lock in exported functionsKrzysztof Kozlowski2015-01-231-0/+4
| | * PM / OPP: Update kernel documentationNishanth Menon2015-01-231-13/+114
| | * PM / OPP: Ensure consistent naming of static functionsNishanth Menon2015-01-231-31/+31
| | * PM / OPP: export dev_pm_opp_get_notifierNishanth Menon2015-01-231-0/+1
| |/ |/|
| * PM / QoS: Use lockdep asserts to find missing hold of power.lockKrzysztof Kozlowski2015-01-231-0/+4
|/
*---. Merge branches 'pm-domains', 'powercap' and 'pm-tools'Rafael J. Wysocki2014-12-291-1/+2
|\ \ \
| * | | PM / Domains: Export of_genpd_get_from_provider functionAmit Daniel Kachhap2014-12-171-1/+2
* | | | Merge branch 'pm-opp'Rafael J. Wysocki2014-12-291-8/+31
|\ \ \ \
| * | | | PM / OPP: take RCU lock in dev_pm_opp_get_opp_countDmitry Torokhov2014-12-181-7/+8
| * | | | PM / OPP: fix warning in of_free_opp_table()Dmitry Torokhov2014-12-181-2/+8
| * | | | PM / OPP: add some lockdep annotationsDmitry Torokhov2014-12-181-0/+16
| | | | |
| \ \ \ \
| \ \ \ \
| \ \ \ \
*---. \ \ \ \ Merge branches 'pm-opp', 'pm-cpufreq' and 'pm-tools'Rafael J. Wysocki2014-12-181-32/+42
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | / | | | | |_|/ | | | |/| |