Merge remote-tracking branch 'regulator/for-5.7' into regulator-linus

[linux-2.6-microblaze.git] / arch / arm / boot / dts / gemini-dlink-dir-685.dts

diff --git a/arch/arm/boot/dts/gemini-dlink-dir-685.dts b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
index e2030ba..cc39289 100644 (file)
--- a/arch/arm/boot/dts/gemini-dlink-dir-685.dts
+++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
@@ -119,13 +119,11 @@
 
        /*
         * This is a Sunon Maglev GM0502PFV2-8 cooling fan @10000 RPM.
-        * Since the platform has no temperature sensor, this is controlled
-        * from userspace by using the hard disks S.M.A.R.T. temperature
         * sensor. It is turned on when the temperature exceeds 46 degrees
         * and turned off when the temperatures goes below 41 degrees
         * (celsius).
         */
-       gpio-fan {
+       fan0: gpio-fan {
                compatible = "gpio-fan";
                /* Collides with IDE */
                gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
@@ -133,6 +131,40 @@
                #cooling-cells = <2>;
        };
 
+       thermal-zones {
+               chassis-thermal {
+                       /* Poll every 20 seconds */
+                       polling-delay = <20000>;
+                       /* Poll every 2nd second when cooling */
+                       polling-delay-passive = <2000>;
+                       /*  Use the thermal sensor in the hard drive */
+                       thermal-sensors = <&drive0>;
+
+                       /* Tripping points from the fan.script in the rootfs */
+                       trips {
+                               alert: chassis-alert {
+                                       /* At 43 degrees turn on the fan */
+                                       temperature = <43000>;
+                                       hysteresis = <3000>;
+                                       type = "active";
+                               };
+                               crit: chassis-crit {
+                                       /* Just shut down at 60 degrees */
+                                       temperature = <60000>;
+                                       hysteresis = <2000>;
+                                       type = "critical";
+                               };
+                       };
+
+                       cooling-maps {
+                               map0 {
+                                       trip = <&alert>;
+                                       cooling-device = <&fan0 1 1>;
+                               };
+                       };
+               };
+       };
+
        /*
         * The touchpad input is connected to a GPIO bit-banged
         * I2C bus.
@@ -443,8 +475,18 @@
                        };
                };
 
-               ata@63000000 {
+               ide@63000000 {
                        status = "okay";
+
+                       /*
+                        * This drive may have a temperature sensor with a
+                        * thermal zone we can use for thermal control of the
+                        * chassis temperature using the fan.
+                        */
+                       drive0: ide-port@0 {
+                               reg = <0>;
+                               #thermal-sensor-cells = <0>;
+                       };
                };
 
                display-controller@6a000000 {