arm64: fan: update active temperature trip steps

Change trip temperature calculation to be based only on averate of
CPU-therm+GPU-therm instead of average of Tdiode+Tboard. Also update
active temperature trip steps vs fan-pwm rates for Jetson-E

Bug 1631048

Change-Id: I466510ce91ab6487336203702cf3f5d0da95cb17
Signed-off-by: Shreshtha SAHU <ssahu@nvidia.com>
Reviewed-on: http://git-master/r/734938
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

diff --git a/arch/arm64/boot/dts/tegra210-jetson-e-base-p2595-0000-a00.dts b/arch/arm64/boot/dts/tegra210-jetson-e-base-p2595-0000-a00.dts
index 630bd1434475f2abf208206ca90f6c505ac25252..abd99e823b1a5070fb508a19088521886b0c77da 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-jetson-e-base-p2595-0000-a00.dts
+++ b/arch/arm64/boot/dts/tegra210-jetson-e-base-p2595-0000-a00.dts
@@ -397,14 +397,6 @@
                status = "okay";
        };
 
-       thermal-fan-est {
-               compatible = "thermal-fan-est";
-               active_trip_temps = <0 63000 74000 85000 120000
-                               140000 150000 160000 170000 180000>;
-               active_hysteresis = <0 15000 11000 6000 4000
-                               0 0 0 0 0>;
-       };
-
        thermal-zones {
                AO-therm {
                        status = "okay";
@@ -417,7 +409,7 @@
        pwm-fan {
                compatible = "pwm-fan";
                shared_data = <&pwm_fan_shared_data>;
-               active_pwm = <0 70 115 135 135 240 245 250 252 255>;
+               active_pwm = <0 80 120 160 255 255 255 255 255 255>;
        };
 
        i2c@7000c000 {

diff --git a/arch/arm64/boot/dts/tegra210-platforms/tegra210-thermal-fan-est-p2530-0930.dtsi b/arch/arm64/boot/dts/tegra210-platforms/tegra210-thermal-fan-est-p2530-0930.dtsi
index a9da77d51785e8a848cf2061003e01ff060d40f0..40671d5584c4562847df3adebdf91ed58f2947aa 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-platforms/tegra210-thermal-fan-est-p2530-0930.dtsi
+++ b/arch/arm64/boot/dts/tegra210-platforms/tegra210-thermal-fan-est-p2530-0930.dtsi
@@ -21,24 +21,25 @@
                tzp_governor_name = "pid_thermal_gov";
 
                dev1 {
-                       dev_data = "Tboard_tegra";
+                       dev_data = "CPU-therm";
                        coeffs = <50 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0>;
                };
 
                dev2 {
-                       dev_data = "Tdiode_tegra";
+                       dev_data = "GPU-therm";
                        coeffs = <50 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0>;
                };
        };
 
        thermal-fan-est {
                name = "thermal-fan-est";
+               compatible = "thermal-fan-est";
                num_resources = <0>;
                shared_data = <&thermal_fan_est_shared_data>;
                trip_length = <10>;
-               active_trip_temps = <0 57000 63000 74000 85000
+               active_trip_temps = <0 51000 61000 71000 82000
                                140000 150000 160000 170000 180000>;
-               active_hysteresis = <0 20000 7000 10000 10000
+               active_hysteresis = <0 15000 9000 9000 10000
                                0 0 0 0 0>;
        };
 };