diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-09-28 15:08:07 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-09-28 15:08:07 -0400 |
commit | abeb19a219dce5c021c759d01434f82924354df7 (patch) | |
tree | c59e586bcc612c95209c4dce04611b2a475588b4 | |
parent | e4d8ae00169f7686e1da5a62e5cf797d12bf8822 (diff) | |
parent | 8aba2333904f9b1c1ea038df261bf7ae8fefb98e (diff) |
Merge branches 'pm-opp' and 'pm-cpufreq'
* pm-opp:
PM / OPP: Call notifier without holding opp_table->lock
* pm-cpufreq:
cpufreq: docs: Drop intel-pstate.txt from index.txt
cpufreq: dt: Fix sysfs duplicate filename creation for platform-device
-rw-r--r-- | Documentation/cpu-freq/index.txt | 2 | ||||
-rw-r--r-- | drivers/cpufreq/cpufreq-dt-platdev.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/cpu-freq/index.txt b/Documentation/cpu-freq/index.txt index 03a7cee6ac73..c15e75386a05 100644 --- a/Documentation/cpu-freq/index.txt +++ b/Documentation/cpu-freq/index.txt | |||
@@ -32,8 +32,6 @@ cpufreq-stats.txt - General description of sysfs cpufreq stats. | |||
32 | 32 | ||
33 | index.txt - File index, Mailing list and Links (this document) | 33 | index.txt - File index, Mailing list and Links (this document) |
34 | 34 | ||
35 | intel-pstate.txt - Intel pstate cpufreq driver specific file. | ||
36 | |||
37 | pcc-cpufreq.txt - PCC cpufreq driver specific file. | 35 | pcc-cpufreq.txt - PCC cpufreq driver specific file. |
38 | 36 | ||
39 | 37 | ||
diff --git a/drivers/cpufreq/cpufreq-dt-platdev.c b/drivers/cpufreq/cpufreq-dt-platdev.c index 430edadca527..a753c50e9e41 100644 --- a/drivers/cpufreq/cpufreq-dt-platdev.c +++ b/drivers/cpufreq/cpufreq-dt-platdev.c | |||
@@ -118,6 +118,10 @@ static const struct of_device_id blacklist[] __initconst = { | |||
118 | 118 | ||
119 | { .compatible = "sigma,tango4", }, | 119 | { .compatible = "sigma,tango4", }, |
120 | 120 | ||
121 | { .compatible = "ti,am33xx", }, | ||
122 | { .compatible = "ti,am43", }, | ||
123 | { .compatible = "ti,dra7", }, | ||
124 | |||
121 | { } | 125 | { } |
122 | }; | 126 | }; |
123 | 127 | ||