From: Rafael J. Wysocki Date: Sun, 28 Apr 2013 00:10:46 +0000 (+0200) Subject: Merge branch 'pm-cpufreq' X-Git-Tag: firefly_0821_release~3680^2~504^2~4 X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=commitdiff_plain;h=885f925eef411f549f17bc64dd054a3269cf66cd Merge branch 'pm-cpufreq' * pm-cpufreq: (57 commits) cpufreq: MAINTAINERS: Add co-maintainer cpufreq: pxa2xx: initialize variables ARM: S5pv210: compiling issue, ARM_S5PV210_CPUFREQ needs CONFIG_CPU_FREQ_TABLE=y cpufreq: cpu0: Put cpu parent node after using it cpufreq: ARM big LITTLE: Adapt to latest cpufreq updates cpufreq: ARM big LITTLE: put DT nodes after using them cpufreq: Don't call __cpufreq_governor() for drivers without target() cpufreq: exynos5440: Protect OPP search calls with RCU lock cpufreq: dbx500: Round to closest available freq cpufreq: Call __cpufreq_governor() with correct policy->cpus mask cpufreq / intel_pstate: Optimize intel_pstate_set_policy cpufreq: OMAP: instantiate omap-cpufreq as a platform_driver arm: exynos: Enable OPP library support for exynos5440 cpufreq: exynos: Remove error return even if no soc is found cpufreq: exynos: Add cpufreq driver for exynos5440 cpufreq: AMD "frequency sensitivity feedback" powersave bias for ondemand governor cpufreq: ondemand: allow custom powersave_bias_target handler to be registered cpufreq: convert cpufreq_driver to using RCU cpufreq: powerpc/platforms/cell: move cpufreq driver to drivers/cpufreq cpufreq: sparc: move cpufreq driver to drivers/cpufreq ... Conflicts: MAINTAINERS (with commit a8e39c3 from pm-cpuidle) drivers/cpufreq/cpufreq_governor.h (with commit beb0ff3) --- 885f925eef411f549f17bc64dd054a3269cf66cd diff --cc MAINTAINERS index 1bef08d407f3,a1746f5f4bc6..8faa946d0c10 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -2206,15 -2208,17 +2208,26 @@@ T: git://git.kernel.org/pub/scm/linux/k F: drivers/cpufreq/ F: include/linux/cpufreq.h + CPU FREQUENCY DRIVERS - ARM BIG LITTLE + M: Viresh Kumar + M: Sudeep KarkadaNagesha + L: cpufreq@vger.kernel.org + L: linux-pm@vger.kernel.org + W: http://www.arm.com/products/processors/technologies/biglittleprocessing.php + S: Maintained + F: drivers/cpufreq/arm_big_little.h + F: drivers/cpufreq/arm_big_little.c + F: drivers/cpufreq/arm_big_little_dt.c + +CPUIDLE DRIVERS +M: Rafael J. Wysocki +M: Daniel Lezcano +L: linux-pm@vger.kernel.org +S: Maintained +T: git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git +F: drivers/cpuidle/* +F: include/linux/cpuidle.h + CPUID/MSR DRIVER M: "H. Peter Anvin" S: Maintained diff --cc drivers/cpufreq/cpufreq_governor.h index cc4bd2f6838a,9f668e94dead..8ac33538d0bd --- a/drivers/cpufreq/cpufreq_governor.h +++ b/drivers/cpufreq/cpufreq_governor.h @@@ -173,6 -259,12 +259,12 @@@ u64 get_cpu_idle_time(unsigned int cpu void dbs_check_cpu(struct dbs_data *dbs_data, int cpu); bool need_load_eval(struct cpu_dbs_common_info *cdbs, unsigned int sampling_rate); - int cpufreq_governor_dbs(struct dbs_data *dbs_data, - struct cpufreq_policy *policy, unsigned int event); + int cpufreq_governor_dbs(struct cpufreq_policy *policy, + struct common_dbs_data *cdata, unsigned int event); + void gov_queue_work(struct dbs_data *dbs_data, struct cpufreq_policy *policy, + unsigned int delay, bool all_cpus); + void od_register_powersave_bias_handler(unsigned int (*f) + (struct cpufreq_policy *, unsigned int, unsigned int), + unsigned int powersave_bias); + void od_unregister_powersave_bias_handler(void); -#endif /* _CPUFREQ_GOVERNER_H */ +#endif /* _CPUFREQ_GOVERNOR_H */