Merge tag 'clk-for-linus-3.14-part2' of git://git.linaro.org/people/mike.turquette...

[linux-2.6-block.git] / arch / arm / boot / dts / omap5.dtsi

diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index 2f12a47aa83c0e1f3ec68588c1ab107384975603..a72813a9663eccd7075b185489cbda4694fd0003 100644 (file)
--- 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 */
@@ -781,13 +791,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>;
                };
        };
 };