Merge tag 'pci-v5.14-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / tegra30-asus-nexus7-grouper-common.dtsi

diff --git a/arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi b/arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi
index dc773b1..ae8300b 100644 (file)
--- a/arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi
+++ b/arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi
@@ -927,7 +927,6 @@
                        compatible = "ti,bq27541";
                        reg = <0x55>;
                        power-supplies = <&power_supply>;
-                       monitored-battery = <&battery_cell>;
                };
 
                power_supply: charger@6a {
@@ -1252,13 +1251,6 @@
        };
 
        thermal-zones {
-               skin-thermal {
-                       polling-delay-passive = <1000>; /* milliseconds */
-                       polling-delay = <0>; /* milliseconds */
-
-                       thermal-sensors = <&nct72 0>;
-               };
-
                cpu-thermal {
                        polling-delay-passive = <1000>; /* milliseconds */
                        polling-delay = <5000>; /* milliseconds */
@@ -1274,8 +1266,8 @@
                                };
 
                                trip1: cpu-crit {
-                                       /* shut down at 60C */
-                                       temperature = <60000>;
+                                       /* shut down at 65C */
+                                       temperature = <65000>;
                                        hysteresis = <2000>;
                                        type = "critical";
                                };
@@ -1287,7 +1279,9 @@
                                        cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
                                                         <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
                                                         <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                                        <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+                                                        <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+                                                        <&actmon THERMAL_NO_LIMIT
+                                                                 THERMAL_NO_LIMIT>;
                                };
                        };
                };