diff options
author | Diwakar Tundlam <dtundlam@nvidia.com> | 2013-01-29 16:44:32 -0800 |
---|---|---|
committer | Mandar Padmawar <mpadmawar@nvidia.com> | 2013-01-31 02:38:42 -0800 |
commit | 2af79db3c5763d3a0b6e78663ccf1ad6c04be134 (patch) | |
tree | 13451b517f436a86d9a189311daa590e55d59c46 /arch/arm/mach-tegra/edp.c | |
parent | c98308fd66c980a4f171f10faf24486895c660c8 (diff) |
arm: tegra: Move all tj dependent thermals from nct to soc_therm
Functions moved are vdd_cpu, core edp. Raised shutdown limit for nct.
Added two higher temps for cpu_edp to support higher soc_therm temps.
Doing this only for Dalmore and Pluto. No real changes to Roth.
Bug 1200075
Change-Id: I2b4ac4ba7cd933bd47c30ab2ad9eabb3a3da5fbe
Signed-off-by: Diwakar Tundlam <dtundlam@nvidia.com>
Reviewed-on: http://git-master/r/195331
Reviewed-by: Mandar Padmawar <mpadmawar@nvidia.com>
Tested-by: Mandar Padmawar <mpadmawar@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/edp.c')
-rw-r--r-- | arch/arm/mach-tegra/edp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/edp.c b/arch/arm/mach-tegra/edp.c index 00d17c0c5f42..67ea94236c48 100644 --- a/arch/arm/mach-tegra/edp.c +++ b/arch/arm/mach-tegra/edp.c @@ -325,7 +325,7 @@ static struct tegra_edp_limits edp_default_limits[] = { }; /* Constants for EDP calculations */ -static int temperatures[] = { 23, 40, 50, 60, 70, 75, 80, 85, 90, 95 }; +static int temperatures[] = { 23, 40, 50, 60, 70, 75, 80, 85, 90, 95, 100, 105 }; static struct tegra_edp_cpu_leakage_params leakage_params[] = { { .cpu_speedo_id = 0, /* A01 CPU */ @@ -826,7 +826,7 @@ void tegra_platform_edp_init(struct thermal_trip_info *trips, int *num_trips) for (i = 0; i < cpu_edp_limits_size-1; i++) { trip_state = &trips[*num_trips]; - trip_state->cdev_type = "edp"; + trip_state->cdev_type = "cpu_edp"; trip_state->trip_temp = cpu_edp_limits[i].temperature * 1000; trip_state->trip_type = THERMAL_TRIP_ACTIVE; |