aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-10-06 19:18:30 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-10-06 19:18:30 -0400
commit0f4685d0ec9aa1db99f014f8f774518cae085aca (patch)
tree4f8abd9e2ccf98a83d29b3dabf6116f8110fedf1 /Documentation
parentb2eed302b67014a3825331c63880bf228ac842eb (diff)
parent6f1293ff747ddcb696d546e3efcd31f7cc42b9a5 (diff)
Merge branch 'pm-cpufreq'
* pm-cpufreq: cpufreq: cpufreq-dt: fix potential double put of cpu OF node cpufreq: cpu0: rename driver and internals to 'cpufreq_dt' cpufreq: ppc-corenet: remove duplicate update of cpu_data cpufreq: Replace strnicmp with strncasecmp cpufreq: powernv: Set the cpus to nominal frequency during reboot/kexec cpufreq: powernv: Set the pstate of the last hotplugged out cpu in policy->cpus to minimum cpufreq: Allow stop CPU callback to be used by all cpufreq drivers cpufreq: cpu0: Make allocate_resources() work for any CPU cpufreq: cpu0: try regulators with name "cpu-supply" cpufreq: cpu0: Move per-cluster initialization code to ->init() cpufreq: cpu0: use dev_{err|warn|dbg} instead of pr_{err|warn|debug} cpufreq: cpu0: print relevant error when we defer probe cpufreq: cpu0: don't validate clock on clk_put() cpufreq: cpu0: Update Module Author cpufreq: Add support for per-policy driver data
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/cpufreq/cpufreq-dt.txt (renamed from Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt)8
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt b/Documentation/devicetree/bindings/cpufreq/cpufreq-dt.txt
index 366690cb86a3..e41c98ffbccb 100644
--- a/Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt
+++ b/Documentation/devicetree/bindings/cpufreq/cpufreq-dt.txt
@@ -1,8 +1,8 @@
1Generic CPU0 cpufreq driver 1Generic cpufreq driver
2 2
3It is a generic cpufreq driver for CPU0 frequency management. It 3It is a generic DT based cpufreq driver for frequency management. It supports
4supports both uniprocessor (UP) and symmetric multiprocessor (SMP) 4both uniprocessor (UP) and symmetric multiprocessor (SMP) systems which share
5systems which share clock and voltage across all CPUs. 5clock and voltage across all CPUs.
6 6
7Both required and optional properties listed below must be defined 7Both required and optional properties listed below must be defined
8under node /cpus/cpu@0. 8under node /cpus/cpu@0.