Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...

[karo-tx-linux.git] / arch / arm / boot / dts / bcm5301x.dtsi

diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi
index acee36a610047f69383990ebc980508ea6e47fd8..98647d22b291f100399290adf1d2ed67b31fe0e7 100644 (file)
--- a/arch/arm/boot/dts/bcm5301x.dtsi
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
@@ -320,6 +320,14 @@
                };
        };
 
+       mdio: mdio@18003000 {
+               compatible = "brcm,iproc-mdio";
+               reg = <0x18003000 0x8>;
+               #size-cells = <1>;
+               #address-cells = <0>;
+               status = "disabled";
+       };
+
        i2c0: i2c@18009000 {
                compatible = "brcm,iproc-i2c";
                reg = <0x18009000 0x50>;
@@ -349,6 +357,12 @@
                                     "sata2";
        };
 
+       thermal: thermal@1800c2c0 {
+               compatible = "brcm,ns-thermal";
+               reg = <0x1800c2c0 0x10>;
+               #thermal-sensor-cells = <0>;
+       };
+
        srab: srab@18007000 {
                compatible = "brcm,bcm5301x-srab";
                reg = <0x18007000 0x1000>;
@@ -412,4 +426,24 @@
                        status = "disabled";
                };
        };
+
+       thermal-zones {
+               cpu_thermal: cpu-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <1000>;
+                       coefficients = <(-556) 418000>;
+                       thermal-sensors = <&thermal>;
+
+                       trips {
+                               cpu-crit {
+                                       temperature     = <125000>;
+                                       hysteresis      = <0>;
+                                       type            = "critical";
+                               };
+                       };
+
+                       cooling-maps {
+                       };
+               };
+       };
 };