浏览代码

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
Rafael J. Wysocki 7 年之前
父节点
当前提交
abeb19a219
共有 2 个文件被更改,包括 4 次插入2 次删除
  1. 0 2
      Documentation/cpu-freq/index.txt
  2. 4 0
      drivers/cpufreq/cpufreq-dt-platdev.c

+ 0 - 2
Documentation/cpu-freq/index.txt

@@ -32,8 +32,6 @@ cpufreq-stats.txt -	General description of sysfs cpufreq stats.
 
 
 index.txt	-	File index, Mailing list and Links (this document)
 index.txt	-	File index, Mailing list and Links (this document)
 
 
-intel-pstate.txt -	Intel pstate cpufreq driver specific file.
-
 pcc-cpufreq.txt -	PCC cpufreq driver specific file.
 pcc-cpufreq.txt -	PCC cpufreq driver specific file.
 
 
 
 

+ 4 - 0
drivers/cpufreq/cpufreq-dt-platdev.c

@@ -118,6 +118,10 @@ static const struct of_device_id blacklist[] __initconst = {
 
 
 	{ .compatible = "sigma,tango4", },
 	{ .compatible = "sigma,tango4", },
 
 
+	{ .compatible = "ti,am33xx", },
+	{ .compatible = "ti,am43", },
+	{ .compatible = "ti,dra7", },
+
 	{ }
 	{ }
 };
 };