summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-04-15 00:23:36 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-04-15 00:23:36 +0200
commitc97ad0fc4f075a9c1ba669963cfd4da062bbb683 (patch)
treee3e81772ed54679ba2b1baf73ef65e40d2a4499e /arch/arm
parentc4a3fa261b16858416f1fd7db03a33d7ef5fc0b3 (diff)
parent69a07f1803f33a70a8270521bdbd1b43fda47992 (diff)
Merge back cpufreq core changes for v4.12.
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/ste-dbx5x0.dtsi5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/ste-dbx5x0.dtsi b/arch/arm/boot/dts/ste-dbx5x0.dtsi
index 162e1eb5373d..6c5affe2d0f5 100644
--- a/arch/arm/boot/dts/ste-dbx5x0.dtsi
+++ b/arch/arm/boot/dts/ste-dbx5x0.dtsi
@@ -1189,11 +1189,6 @@
status = "disabled";
};
- cpufreq-cooling {
- compatible = "stericsson,db8500-cpufreq-cooling";
- status = "disabled";
- };
-
mcde@a0350000 {
compatible = "stericsson,mcde";
reg = <0xa0350000 0x1000>, /* MCDE */