Merge tag 'sound-fix-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[sfrench/cifs-2.6.git] / arch / arm64 / boot / dts / marvell / armada-cp110.dtsi

diff --git a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
index b9d9f31e3ba1ff9a9fd81f89a75fde4a3d237e27..4d6e4a097f720e0f7ae39b3f6b79e6501458efc9 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
@@ -28,12 +28,19 @@
         */
        thermal-zones {
                CP110_LABEL(thermal_ic): CP110_NODE_NAME(thermal-ic) {
-                       polling-delay-passive = <1000>;
-                       polling-delay = <1000>;
+                       polling-delay-passive = <0>; /* Interrupt driven */
+                       polling-delay = <0>; /* Interrupt driven */
 
                        thermal-sensors = <&CP110_LABEL(thermal) 0>;
 
-                       trips { };
+                       trips {
+                               CP110_LABEL(crit): crit {
+                                       temperature = <100000>; /* mC degrees */
+                                       hysteresis = <2000>; /* mC degrees */
+                                       type = "critical";
+                               };
+                       };
+
                        cooling-maps { };
                };
        };
@@ -259,6 +266,8 @@
                        CP110_LABEL(thermal): thermal-sensor@70 {
                                compatible = "marvell,armada-cp110-thermal";
                                reg = <0x70 0x10>;
+                               interrupts-extended =
+                                       <&CP110_LABEL(icu_sei) 116 IRQ_TYPE_LEVEL_HIGH>;
                                #thermal-sensor-cells = <1>;
                        };
                };