5 files changed, 2 insertions, 27 deletions

diff --git a/arch/arm/mach-tegra/board-common.c b/arch/arm/mach-tegra/board-common.c
index 967bf51652f0..54d04141384d 100644
--- a/arch/arm/mach-tegra/board-common.c
+++ b/arch/arm/mach-tegra/board-common.c
@@ -166,7 +166,6 @@ static void tegra_add_trip_points(struct thermal_trip_info *trips,
 
 void tegra_add_cdev_trips(struct thermal_trip_info *trips, int *num_trips)
 {
-	tegra_add_trip_points(trips, num_trips, tegra_dvfs_get_cpu_dfll_cdev());
 	tegra_add_trip_points(trips, num_trips, tegra_dvfs_get_cpu_pll_cdev());
 	tegra_add_trip_points(trips, num_trips, tegra_dvfs_get_core_cdev());
 }
diff --git a/arch/arm/mach-tegra/dvfs.c b/arch/arm/mach-tegra/dvfs.c
index 11143794fd95..1f37a4c30685 100644
--- a/arch/arm/mach-tegra/dvfs.c
+++ b/arch/arm/mach-tegra/dvfs.c
@@ -65,10 +65,7 @@ void tegra_dvfs_add_relationships(struct dvfs_relationship *rels, int n)
 	mutex_unlock(&dvfs_lock);
 }
 
-/*
- * Make sure that DFLL and PLL mode cooling devices have identical set of
- * trip-points (needed for DFLL/PLL auto-switch) and matching thermal floors.
- */
+/* Make sure there is a matching cooling device for thermal limit profile. */
 static void dvfs_validate_cdevs(struct dvfs_rail *rail)
 {
 	if (!rail->therm_mv_floors != !rail->therm_mv_floors_num) {
@@ -88,14 +85,6 @@ static void dvfs_validate_cdevs(struct dvfs_rail *rail)
 
 	if (rail->therm_mv_floors && !rail->pll_mode_cdev)
 		WARN(1, "%s: missing pll mode cooling device\n", rail->reg_id);
-
-	if (rail->dfll_mode_cdev) {
-		if (rail->dfll_mode_cdev != rail->pll_mode_cdev) {
-			rail->dfll_mode_cdev = NULL;
-			WARN(1, "%s: not matching dfll/pll mode trip-points\n",
-			     rail->reg_id);
-		}
-	}
 }
 
 int tegra_dvfs_init_rails(struct dvfs_rail *rails[], int n)
@@ -877,15 +866,6 @@ int tegra_dvfs_dfll_mode_clear(struct dvfs *d, unsigned long rate)
 	return ret;
 }
 
-struct tegra_cooling_device *tegra_dvfs_get_cpu_dfll_cdev(void)
-{
-	/* dfll mode need its own trips only if they are different */
-	if (tegra_cpu_rail &&
-	    (tegra_cpu_rail->dfll_mode_cdev != tegra_cpu_rail->pll_mode_cdev))
-		return tegra_cpu_rail->dfll_mode_cdev;
-	return NULL;
-}
-
 struct tegra_cooling_device *tegra_dvfs_get_cpu_pll_cdev(void)
 {
 	if (tegra_cpu_rail)
diff --git a/arch/arm/mach-tegra/dvfs.h b/arch/arm/mach-tegra/dvfs.h
index 857258e5a6fa..d38f8a8ab00c 100644
--- a/arch/arm/mach-tegra/dvfs.h
+++ b/arch/arm/mach-tegra/dvfs.h
@@ -85,7 +85,6 @@ struct dvfs_rail {
 	bool dfll_mode_updating;
 	int thermal_idx;
 	struct tegra_cooling_device *pll_mode_cdev;
-	struct tegra_cooling_device *dfll_mode_cdev;
 	struct rail_stats stats;
 };
 
@@ -220,7 +219,6 @@ int tegra_cpu_dvfs_alter(int edp_thermal_index, const cpumask_t *cpus,
 			 bool before_clk_update, int cpu_event);
 int tegra_dvfs_dfll_mode_set(struct dvfs *d, unsigned long rate);
 int tegra_dvfs_dfll_mode_clear(struct dvfs *d, unsigned long rate);
-struct tegra_cooling_device *tegra_dvfs_get_cpu_dfll_cdev(void);
 struct tegra_cooling_device *tegra_dvfs_get_cpu_pll_cdev(void);
 struct tegra_cooling_device *tegra_dvfs_get_core_cdev(void);
 int tegra_dvfs_rail_dfll_mode_set_cold(struct dvfs_rail *rail);
diff --git a/arch/arm/mach-tegra/tegra11_dvfs.c b/arch/arm/mach-tegra/tegra11_dvfs.c
index 41aabe8f72b2..b12380102318 100644
--- a/arch/arm/mach-tegra/tegra11_dvfs.c
+++ b/arch/arm/mach-tegra/tegra11_dvfs.c
@@ -446,8 +446,6 @@ static void __init init_rail_thermal_profile(
 	if (rail->pll_mode_cdev) {
 		rail->pll_mode_cdev->trip_temperatures_num = i + 1;
 		rail->pll_mode_cdev->trip_temperatures = therm_trips_table;
-		if (d)
-			rail->dfll_mode_cdev = rail->pll_mode_cdev;
 	}
 }
 
diff --git a/arch/arm/mach-tegra/tegra_cl_dvfs.c b/arch/arm/mach-tegra/tegra_cl_dvfs.c
index 901b19f79400..90e363ed156e 100644
--- a/arch/arm/mach-tegra/tegra_cl_dvfs.c
+++ b/arch/arm/mach-tegra/tegra_cl_dvfs.c
@@ -1220,7 +1220,7 @@ static int __init tegra_cl_dvfs_probe(struct platform_device *pdev)
 	cld->dfll_clk = dfll_clk;
 	cld->safe_dvfs = safe_dvfs_clk->dvfs;
 #ifdef CONFIG_THERMAL
-	cld->cdev = cld->safe_dvfs->dvfs_rail->dfll_mode_cdev;
+	cld->cdev = cld->safe_dvfs->dvfs_rail->pll_mode_cdev;
 	INIT_WORK(&cld->init_cdev_work, tegra_cl_dvfs_init_cdev);
 #endif
 	/* Initialize cl_dvfs */