Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abeb19a2 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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
parents e4d8ae00 8aba2333

Documentation/cpu-freq/index.txt

+0 −2
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ cpufreq-stats.txt - General description of sysfs cpufreq stats. 


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.

drivers/cpufreq/cpufreq-dt-platdev.c

+4 −0
Original line number Diff line number Diff line
@@ -118,6 +118,10 @@ static const struct of_device_id blacklist[] __initconst = { 


	{ .compatible = "sigma,tango4", },



	{ .compatible = "ti,am33xx", },

	{ .compatible = "ti,am43", },

	{ .compatible = "ti,dra7", },



	{ }

};