diff options
| author | Tero Kristo <t-kristo@ti.com> | 2014-09-11 18:23:44 +0300 |
|---|---|---|
| committer | Tero Kristo <t-kristo@ti.com> | 2014-09-11 18:23:44 +0300 |
| commit | 3cbc8e24056ead0ffbe187a3c70df6c0d64aafb9 (patch) | |
| tree | 3858d2d70fc2f6c479ec4281a420d4a933d98ccb /arch | |
| parent | 60b9cb6bfad9f16550267ea07d0b27066bd619f7 (diff) | |
ARM: dts: OMAP5+: separate the cpu thermal zone definition from omap4
OMAP4 has a finer counter granularity, which allows for a delay of 1000ms
in the thermal zone polling intervals. OMAP5/DRA7 have different counter
mechanism, which allows at maximum a 500ms timer. Adjust the cpu thermal
zone accordingly for OMAP5/DRA7.
Signed-off-by: Tero Kristo <t-kristo@ti.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/dra72x.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/dra74x.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/omap5-cpu-thermal.dtsi | 41 | ||||
| -rw-r--r-- | arch/arm/boot/dts/omap5.dtsi | 2 |
4 files changed, 44 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/dra72x.dtsi b/arch/arm/boot/dts/dra72x.dtsi index 485589f5b4e..64642a617bb 100644 --- a/arch/arm/boot/dts/dra72x.dtsi +++ b/arch/arm/boot/dts/dra72x.dtsi @@ -39,6 +39,6 @@ }; thermal-zones { - #include "omap4-cpu-thermal.dtsi" + #include "omap5-cpu-thermal.dtsi" }; }; diff --git a/arch/arm/boot/dts/dra74x.dtsi b/arch/arm/boot/dts/dra74x.dtsi index 47fa1dcfec1..871a9947a8f 100644 --- a/arch/arm/boot/dts/dra74x.dtsi +++ b/arch/arm/boot/dts/dra74x.dtsi @@ -44,6 +44,6 @@ }; thermal-zones { - #include "omap4-cpu-thermal.dtsi" + #include "omap5-cpu-thermal.dtsi" }; }; diff --git a/arch/arm/boot/dts/omap5-cpu-thermal.dtsi b/arch/arm/boot/dts/omap5-cpu-thermal.dtsi new file mode 100644 index 00000000000..3f2c9f38400 --- /dev/null +++ b/arch/arm/boot/dts/omap5-cpu-thermal.dtsi @@ -0,0 +1,41 @@ +/* + * Device Tree Source for OMAP4/5 SoC CPU thermal + * + * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/ + * Contact: Tero Kristo <t-kristo@ti.com> + * + * This file is licensed under the terms of the GNU General Public License + * version 2. This program is licensed "as is" without any warranty of any + * kind, whether express or implied. + */ + +#include <dt-bindings/thermal/thermal.h> + +cpu_thermal: cpu_thermal { + polling-delay-passive = <250>; /* milliseconds */ + polling-delay = <500>; /* milliseconds */ + + /* sensor ID */ + thermal-sensors = <&bandgap 0>; + + trips { + cpu_alert0: cpu_alert { + temperature = <100000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "passive"; + }; + cpu_crit: cpu_crit { + temperature = <125000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "critical"; + }; + }; + + cooling-maps { + map0 { + trip = <&cpu_alert0>; + cooling-device = + <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + }; +}; diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi index 6284bdaa7eb..2939efd9bbe 100644 --- a/arch/arm/boot/dts/omap5.dtsi +++ b/arch/arm/boot/dts/omap5.dtsi @@ -67,7 +67,7 @@ }; thermal-zones { - #include "omap4-cpu-thermal.dtsi" + #include "omap5-cpu-thermal.dtsi" #include "omap5-gpu-thermal.dtsi" #include "omap5-core-thermal.dtsi" }; |