Revert "Tegra210: increase vmin to increase reliability"
David Dastous St Hilaire [Fri, 20 Jan 2017 03:02:46 +0000 (19:02 -0800)]
This reverts commit dee4048d8cb60b1ec497869a67edc826fac29104.

Bug 1828585

Change-Id: Iefbd4910b780f33fdab24bb1ed3ade066b08f0f7
Signed-off-by: David DSH <ddastoussthi@nvidia.com>
Reviewed-on: http://git-master/r/1296819
Reviewed-by: Vinayak Pane <vpane@nvidia.com>
Tested-by: Vinayak Pane <vpane@nvidia.com>

arch/arm64/boot/dts/tegra210-darcy-p2894-0050-a04-00.dts
arch/arm64/boot/dts/tegra210-platforms/tegra210-darcy-power-dvfs-p2894-0050-a07.dtsi
arch/arm64/boot/dts/tegra210-platforms/tegra210-darcy-power-hyper.dtsi [deleted file]

index 207c2d9..6eb0643 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * arch/arm64/boot/dts/tegra210-darcy-p2894-0050-a04-00.dts
  *
- * Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,9 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
-#include "tegra210-darcy-p2894-0000-a00-00.dts"
-#include "tegra210-platforms/tegra210-darcy-power-hyper.dtsi"
 
+#include "tegra210-darcy-p2894-0000-a00-00.dts"
 / {
        nvidia,dtsfilename = __FILE__;
        chosen {
index a571f04..c323145 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017 NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2014-2016 NVIDIA CORPORATION. All rights reserved.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
  */
 
 / {
-       dvfs_rails {
-               cpu_vmin_cdev: vdd-cpu-vmin-cdev@5 {
-                       nvidia,trips = <&cpu_vmin1 1130>;
-               };
-
-               cpu_vmax_cdev: vdd-cpu-vmax-cdev@8 {
-                       nvidia,trips = <&cpu_vmax1 1170 &cpu_vmax2 1170>;
-               };
-
-       };
        thermal-zones {
                /delete-node/ Tdiode_tegra;
 
@@ -33,7 +23,7 @@
                };
 
                AO-therm {
-                       SET_MAP_TRIP(cpu, cpu, vmin, 1, 86000);
+                       SET_MAP_TRIP(cpu, cpu, vmin, 1, 15000);
                };
                AO-therm {
                        trips {
                        SET_MAP_TRIP(core, core, vmin, 1, 15000);
                        SET_MAP_TRIP(core, core, vmax, 1, 85000);
                };
-               CPU-therm {
-                       trips {
-                               cpu_critical {
-                                       temperature = <86000>;
-                               };
-                               cpu_heavy {
-                                       temperature = <84000>;
-                               };
-                       };
-               };
-               GPU-therm {
-                       trips {
-                               gpu_critical {
-                                       temperature = <86000>;
-                               };
-                               gpu_heavy {
-                                       temperature = <84000>;
-                               };
-                       };
-               };
        };
 };
 
diff --git a/arch/arm64/boot/dts/tegra210-platforms/tegra210-darcy-power-hyper.dtsi b/arch/arm64/boot/dts/tegra210-platforms/tegra210-darcy-power-hyper.dtsi
deleted file mode 100644 (file)
index e150565..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/ {
-       dvfs_rails {
-               cpu_vmin_cdev: vdd-cpu-vmin-cdev@5 {
-                       nvidia,trips = <&cpu_vmin1 1130>;
-               };
-               cpu_vmax_cdev: vdd-cpu-vmax-cdev@8 {
-                       nvidia,trips = <&cpu_vmax1 1170 &cpu_vmax2 1170>;
-               };
-       };
-       thermal-zones {
-               Tdiode_tegra {
-                       SET_MAP_TRIP(cpu, cpu, vmin, 1, 86000);
-               };
-               CPU-therm {
-                       trips {
-                               cpu_critical {
-                                       temperature = <86000>;
-                               };
-                               cpu_heavy {
-                                       temperature = <84000>;
-                               };
-                       };
-               };
-               GPU-therm {
-                       trips {
-                               gpu_critical {
-                                       temperature = <86000>;
-                               };
-                               gpu_heavy {
-                                       temperature = <84000>;
-                               };
-                       };
-               };
-       };
-};