diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-04-28 23:14:00 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-04-28 23:14:00 +0200 |
| commit | 0807ee0f525470482ecb002c45abcceed37e24e5 (patch) | |
| tree | 171bac082f8053b6b6030d7669013049150a7816 /arch/arm | |
| parent | 5a7ad1146caa895ad718a534399e38bd2ba721b7 (diff) | |
| parent | 2addac72afb304fa5aa57dbdd12659a8fd52d105 (diff) | |
| download | linux-0807ee0f525470482ecb002c45abcceed37e24e5.tar.bz2 | |
Merge branch 'pm-cpufreq'
* pm-cpufreq: (37 commits)
cpufreq: Add Tegra186 cpufreq driver
cpufreq: imx6q: Fix error handling code
cpufreq: imx6q: Set max suspend_freq to avoid changes during suspend
cpufreq: imx6q: Fix handling EPROBE_DEFER from regulator
cpufreq: schedutil: Use policy-dependent transition delays
cpufreq: schedutil: Reduce frequencies slower
cpufreq: intel_pstate: Add support for Gemini Lake
cpufreq: intel_pstate: Eliminate intel_pstate_get_min_max()
cpufreq: intel_pstate: Do not walk policy->cpus
cpufreq: intel_pstate: Introduce pid_in_use()
cpufreq: intel_pstate: Drop struct cpu_defaults
cpufreq: intel_pstate: Move cpu_defaults definitions
cpufreq: intel_pstate: Add update_util callback to pstate_funcs
cpufreq: intel_pstate: Use different utilization update callbacks
cpufreq: intel_pstate: Modify check in intel_pstate_update_status()
cpufreq: intel_pstate: Drop driver_registered variable
cpufreq: intel_pstate: Skip unnecessary PID resets on init
cpufreq: intel_pstate: Set HWP sampling interval once
cpufreq: intel_pstate: Clean up intel_pstate_busy_pid_reset()
cpufreq: intel_pstate: Fold intel_pstate_reset_all_pid() into the caller
...
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/ste-dbx5x0.dtsi | 5 |
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 */ |