Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into soc-thermal

6 files changed, 149 insertions, 14 deletions

diff --git a/arch/arm/boot/dts/omap4-cpu-thermal.dtsi b/arch/arm/boot/dts/omap4-cpu-thermal.dtsi
new file mode 100644
index 000000000000..cb9458feb2e3
--- /dev/null
+++ b/arch/arm/boot/dts/omap4-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: Eduardo Valentin <eduardo.valentin@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 = <1000>; /* 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/omap443x.dtsi b/arch/arm/boot/dts/omap443x.dtsi
index bcf455efe18d..ab607a19a613 100644
--- a/arch/arm/boot/dts/omap443x.dtsi
+++ b/arch/arm/boot/dts/omap443x.dtsi
@@ -12,7 +12,7 @@
 
 / {
         cpus {
-                cpu@0 {
+                cpu0: cpu@0 {
                         /* OMAP443x variants OPP50-OPPNT */
                         operating-points = <
                                 /* kHz    uV */
@@ -22,12 +22,25 @@
                                 1008000 1375000
                         >;
                         clock-latency = <300000>; /* From legacy driver */
+
+                        /* cooling options */
+                        cooling-min-level = <0>;
+                        cooling-max-level = <3>;
+                        #cooling-cells = <2>; /* min followed by max */
                 };
         };
 
-        bandgap {
-                reg = <0x4a002260 0x4
-                       0x4a00232C 0x4>;
-                compatible = "ti,omap4430-bandgap";
+        thermal-zones {
+                #include "omap4-cpu-thermal.dtsi"
+        };
+
+        ocp {
+                bandgap: bandgap {
+                        reg = <0x4a002260 0x4
+                               0x4a00232C 0x4>;
+                        compatible = "ti,omap4430-bandgap";
+
+                        #thermal-sensor-cells = <0>;
+                };
         };
 };
diff --git a/arch/arm/boot/dts/omap4460.dtsi b/arch/arm/boot/dts/omap4460.dtsi
index c2f0f39b5a24..11566bed0035 100644
--- a/arch/arm/boot/dts/omap4460.dtsi
+++ b/arch/arm/boot/dts/omap4460.dtsi
@@ -12,7 +12,7 @@
 / {
         cpus {
                 /* OMAP446x 'standard device' variants OPP50 to OPPTurbo */
-                cpu@0 {
+                cpu0: cpu@0 {
                         operating-points = <
                                 /* kHz    uV */
                                 350000  1025000
@@ -20,6 +20,11 @@
                                 920000  1313000
                         >;
                         clock-latency = <300000>; /* From legacy driver */
+
+                        /* cooling options */
+                        cooling-min-level = <0>;
+                        cooling-max-level = <2>;
+                        #cooling-cells = <2>; /* min followed by max */
                 };
         };
 
@@ -30,12 +35,20 @@
                 ti,hwmods = "debugss";
         };
 
-        bandgap {
-                reg = <0x4a002260 0x4
-                       0x4a00232C 0x4
-                       0x4a002378 0x18>;
-                compatible = "ti,omap4460-bandgap";
-                interrupts = <0 126 IRQ_TYPE_LEVEL_HIGH>; /* talert */
-                gpios = <&gpio3 22 0>; /* tshut */
+        thermal-zones {
+                #include "omap4-cpu-thermal.dtsi"
+        };
+
+        ocp {
+                bandgap: bandgap {
+                        reg = <0x4a002260 0x4
+                               0x4a00232C 0x4
+                               0x4a002378 0x18>;
+                        compatible = "ti,omap4460-bandgap";
+                        interrupts = <0 126 IRQ_TYPE_LEVEL_HIGH>; /* talert */
+                        gpios = <&gpio3 22 0>; /* tshut */
+
+                        #thermal-sensor-cells = <0>;
+                };
         };
 };
diff --git a/arch/arm/boot/dts/omap5-core-thermal.dtsi b/arch/arm/boot/dts/omap5-core-thermal.dtsi
new file mode 100644
index 000000000000..19212ac6eef0
--- /dev/null
+++ b/arch/arm/boot/dts/omap5-core-thermal.dtsi
@@ -0,0 +1,28 @@
+/*
+ * Device Tree Source for OMAP543x SoC CORE thermal
+ *
+ * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
+ * Contact: Eduardo Valentin <eduardo.valentin@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>
+
+core_thermal: core_thermal {
+        polling-delay-passive = <250>; /* milliseconds */
+        polling-delay = <1000>; /* milliseconds */
+
+                        /* sensor       ID */
+        thermal-sensors = <&bandgap     2>;
+
+        trips {
+                core_crit: core_crit {
+                        temperature = <125000>; /* milliCelsius */
+                        hysteresis = <2000>; /* milliCelsius */
+                        type = "critical";
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/omap5-gpu-thermal.dtsi b/arch/arm/boot/dts/omap5-gpu-thermal.dtsi
new file mode 100644
index 000000000000..1b87aca88b77
--- /dev/null
+++ b/arch/arm/boot/dts/omap5-gpu-thermal.dtsi
@@ -0,0 +1,28 @@
+/*
+ * Device Tree Source for OMAP543x SoC GPU thermal
+ *
+ * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
+ * Contact: Eduardo Valentin <eduardo.valentin@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>
+
+gpu_thermal: gpu_thermal {
+        polling-delay-passive = <250>; /* milliseconds */
+        polling-delay = <1000>; /* milliseconds */
+
+                        /* sensor       ID */
+        thermal-sensors = <&bandgap     1>;
+
+        trips {
+                gpu_crit: gpu_crit {
+                        temperature = <125000>; /* milliCelsius */
+                        hysteresis = <2000>; /* milliCelsius */
+                        type = "critical";
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index fc3fad563861..ab9a21ae82f3 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -49,6 +49,10 @@
                                 1000000 1060000
                                 1500000 1250000
                         >;
+                        /* cooling options */
+                        cooling-min-level = <0>;
+                        cooling-max-level = <2>;
+                        #cooling-cells = <2>; /* min followed by max */
                 };
                 cpu@1 {
                         device_type = "cpu";
@@ -57,6 +61,12 @@
                 };
         };
 
+        thermal-zones {
+                #include "omap4-cpu-thermal.dtsi"
+                #include "omap5-gpu-thermal.dtsi"
+                #include "omap5-core-thermal.dtsi"
+        };
+
         timer {
                 compatible = "arm,armv7-timer";
                 /* PPI secure/nonsecure IRQ */
@@ -729,13 +739,15 @@
                         };
                 };
 
-                bandgap@4a0021e0 {
+                bandgap: bandgap@4a0021e0 {
                         reg = <0x4a0021e0 0xc
                                0x4a00232c 0xc
                                0x4a002380 0x2c
                                0x4a0023C0 0x3c>;
                         interrupts = <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>;
                         compatible = "ti,omap5430-bandgap";
+
+                        #thermal-sensor-cells = <1>;
                 };
         };
 };