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

[~andy/linux] / arch / arm / boot / dts / omap443x.dtsi

diff --git a/arch/arm/boot/dts/omap443x.dtsi b/arch/arm/boot/dts/omap443x.dtsi
index f67e191c1e745e6da74a9f4674e5f2a44312440e..8c1cfad30d603714ce267820186dd8c6635ff923 100644 (file)
--- 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,13 +22,26 @@
                                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>;
+               };
        };
 };