diff options
| author | Alex Frid <afrid@nvidia.com> | 2013-10-26 21:03:10 -0700 |
|---|---|---|
| committer | Yu-Huan Hsu <yhsu@nvidia.com> | 2013-10-29 19:17:45 -0700 |
| commit | 3688489151740f72debf867688158cbd1c7b561a (patch) | |
| tree | 886a2d78d69ea042493038c543a30147cb73e97e /arch/arm/mach-tegra/board-loki-sensors.c | |
| parent | 49b0036ca80b0a5d1259233d2f2a2d64aecd8706 (diff) | |
ARM: tegra: loki: Re-allocate CPU Vmax thermal trip-points
Moved CPU Vmax thermal trip-points to SOC_THERM if available,
otherwise kept them on external thermal monitor.
Change-Id: I5318c243f1b7fbcf576e7dd451b5a2e68a3735d5
Signed-off-by: Alex Frid <afrid@nvidia.com>
Reviewed-on: http://git-master/r/304158
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-loki-sensors.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-loki-sensors.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board-loki-sensors.c b/arch/arm/mach-tegra/board-loki-sensors.c index d11cb79535e1..cbf4ab2b0ef3 100644 --- a/arch/arm/mach-tegra/board-loki-sensors.c +++ b/arch/arm/mach-tegra/board-loki-sensors.c @@ -338,6 +338,8 @@ static int loki_nct72_init(void) tegra_platform_edp_init(loki_nct72_pdata.trips, &loki_nct72_pdata.num_trips, 12000); /* edp temperature margin */ + tegra_add_tj_trips(loki_nct72_pdata.trips, + &loki_nct72_pdata.num_trips); tegra_add_tgpu_trips(loki_nct72_pdata.trips, &loki_nct72_pdata.num_trips); } @@ -345,8 +347,7 @@ static int loki_nct72_init(void) tegra_add_cdev_trips(loki_nct72_pdata.trips, &loki_nct72_pdata.num_trips); - tegra_add_tj_trips(loki_nct72_pdata.trips, - &loki_nct72_pdata.num_trips); + loki_i2c_nct72_board_info[0].irq = gpio_to_irq(nct72_port); ret = gpio_request(nct72_port, "temp_alert"); |