diff options
| author | Diwakar Tundlam <dtundlam@nvidia.com> | 2013-01-17 11:44:26 -0800 |
|---|---|---|
| committer | Mandar Padmawar <mpadmawar@nvidia.com> | 2013-01-23 02:52:13 -0800 |
| commit | bedff5775d6dab5870a777a1b5a1abfc9e23b033 (patch) | |
| tree | 02ec238db4838fad9d769428381750893af05ffe /arch/arm/mach-tegra/edp.c | |
| parent | bf8d7e0d8805ca5a1db1dcd4f396279963d3b235 (diff) | |
arm: tegra: edp changes due to thermal_trip_info use in driver
Bug 1200075
Change-Id: I96b01b1caa468c0d376e79b416aeb329e1cb0390
Signed-off-by: Diwakar Tundlam <dtundlam@nvidia.com>
Reviewed-on: http://git-master/r/190820
Reviewed-by: Automatic_Commit_Validation_User
Diffstat (limited to 'arch/arm/mach-tegra/edp.c')
| -rw-r--r-- | arch/arm/mach-tegra/edp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/edp.c b/arch/arm/mach-tegra/edp.c index 95c26ca3f2d0..00d17c0c5f42 100644 --- a/arch/arm/mach-tegra/edp.c +++ b/arch/arm/mach-tegra/edp.c @@ -808,10 +808,10 @@ void tegra_get_system_edp_limits(const unsigned int **limits) *limits = system_edp_limits; } -void tegra_platform_edp_init(struct nct_trip_temp *trips, int *num_trips) +void tegra_platform_edp_init(struct thermal_trip_info *trips, int *num_trips) { const struct tegra_edp_limits *cpu_edp_limits; - struct nct_trip_temp *trip_state; + struct thermal_trip_info *trip_state; int i, cpu_edp_limits_size; if (!trips || !num_trips) @@ -830,12 +830,12 @@ void tegra_platform_edp_init(struct nct_trip_temp *trips, int *num_trips) trip_state->trip_temp = cpu_edp_limits[i].temperature * 1000; trip_state->trip_type = THERMAL_TRIP_ACTIVE; - trip_state->state = i + 1; + trip_state->upper = trip_state->lower = i + 1; trip_state->hysteresis = 1000; (*num_trips)++; - if (*num_trips >= NCT_MAX_TRIPS) + if (*num_trips >= THERMAL_MAX_TRIPS) BUG(); } } |