arm: tegra: board changes due to thermal_trip_info in soctherm
Diwakar Tundlam [Thu, 17 Jan 2013 21:20:56 +0000 (13:20 -0800)]
Bug 1200075

Change-Id: I7d9b6697e2aa2b13d70edfe8f6fe85d984ffd779
Signed-off-by: Diwakar Tundlam <dtundlam@nvidia.com>
Reviewed-on: http://git-master/r/192163
(cherry picked from commit bfd5a49db4641cf3d19506f7fb928061385ace94)
Reviewed-on: http://git-master/r/195883
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Jinyoung Park <jinyoungp@nvidia.com>

arch/arm/mach-tegra/board-dalmore-power.c
arch/arm/mach-tegra/board-pismo-power.c
arch/arm/mach-tegra/board-pluto-power.c
arch/arm/mach-tegra/board-roth-power.c

index 00b726f..3a49b46 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * arch/arm/mach-tegra/board-dalmore-power.c
  *
- * Copyright (C) 2012 NVIDIA Corporation.
+ * Copyright (C) 2012-2013 NVIDIA Corporation.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -1237,11 +1237,19 @@ static struct soctherm_platform_data dalmore_soctherm_data = {
        .therm = {
                [THERM_CPU] = {
                        .zone_enable = true,
-                       .cdev_type = "tegra-balanced",
                        .thermtrip = 115,
-                       .trip_temp = 85000,
                        .passive_delay = 1000,
-                       .hysteresis = 3000,
+                       .num_trips = 1,
+                       .trips = {
+                               [0] = {
+                                       .cdev_type = "tegra-balanced",
+                                       .trip_temp = 85000,
+                                       .trip_type = THERMAL_TRIP_PASSIVE,
+                                       .upper = THERMAL_NO_LIMIT,
+                                       .lower = THERMAL_NO_LIMIT,
+                                       .hysteresis = 3000,
+                               },
+                       },
                },
                [THERM_GPU] = {
                        .zone_enable = true,
index 7984cb7..fdd50a3 100644 (file)
@@ -35,6 +35,7 @@
 #include <mach/edp.h>
 #include <mach/gpio-tegra.h>
 
+#include "cpu-tegra.h"
 #include "pm.h"
 #include "tegra-board-id.h"
 #include "board.h"
@@ -875,11 +876,19 @@ static struct soctherm_platform_data pismo_soctherm_data = {
        .therm = {
                [THERM_CPU] = {
                        .zone_enable = true,
-                       .cdev_type = "tegra-balanced",
                        .thermtrip = 115,
-                       .trip_temp = 85000,
                        .passive_delay = 1000,
-                       .hysteresis = 3000,
+                       .num_trips = 1,
+                       .trips = {
+                               [0] = {
+                                       .cdev_type = "tegra-balanced",
+                                       .trip_temp = 85000,
+                                       .trip_type = THERMAL_TRIP_PASSIVE,
+                                       .upper = THERMAL_NO_LIMIT,
+                                       .lower = THERMAL_NO_LIMIT,
+                                       .hysteresis = 3000,
+                               },
+                       },
                },
                [THERM_GPU] = {
                        .zone_enable = true,
index c72122c..a12a41c 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * arch/arm/mach-tegra/board-pluto-power.c
  *
- * Copyright (C) 2012 NVIDIA Corporation. All rights reserved.
+ * Copyright (C) 2012-2013 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 version 2 as
@@ -778,11 +778,19 @@ static struct soctherm_platform_data pluto_soctherm_data = {
        .therm = {
                [THERM_CPU] = {
                        .zone_enable = true,
-                       .cdev_type = "tegra-balanced",
                        .thermtrip = 115,
-                       .trip_temp = 85000,
                        .passive_delay = 1000,
-                       .hysteresis = 3000,
+                       .num_trips = 1,
+                       .trips = {
+                               [0] = {
+                                       .cdev_type = "tegra-balanced",
+                                       .trip_temp = 85000,
+                                       .trip_type = THERMAL_TRIP_PASSIVE,
+                                       .upper = THERMAL_NO_LIMIT,
+                                       .lower = THERMAL_NO_LIMIT,
+                                       .hysteresis = 3000,
+                               },
+                       },
                },
                [THERM_GPU] = {
                        .zone_enable = true,
index 25dbe68..6ac7430 100644 (file)
@@ -761,11 +761,19 @@ static struct soctherm_platform_data roth_soctherm_data = {
        .therm = {
                [THERM_CPU] = {
                        .zone_enable = true,
-                       .cdev_type = "tegra-balanced",
                        .thermtrip = 115,
-                       .trip_temp = 85000,
                        .passive_delay = 1000,
-                       .hysteresis = 3000,
+                       .num_trips = 1,
+                       .trips = {
+                               [0] = {
+                                       .cdev_type = "tegra-balanced",
+                                       .trip_temp = 85000,
+                                       .trip_type = THERMAL_TRIP_PASSIVE,
+                                       .upper = THERMAL_NO_LIMIT,
+                                       .lower = THERMAL_NO_LIMIT,
+                                       .hysteresis = 3000,
+                               },
+                       },
                },
                [THERM_GPU] = {
                        .zone_enable = true,