diff options
Diffstat (limited to 'arch/arm/mach-tegra')
| -rw-r--r-- | arch/arm/mach-tegra/board-loki-power.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-loki-sensors.c | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board-loki-power.c b/arch/arm/mach-tegra/board-loki-power.c index 056f69355855..0644f1cbd6b5 100644 --- a/arch/arm/mach-tegra/board-loki-power.c +++ b/arch/arm/mach-tegra/board-loki-power.c @@ -923,6 +923,9 @@ int __init loki_soctherm_init(void) loki_soctherm_data.therm[THERM_CPU].trips, &loki_soctherm_data.therm[THERM_CPU].num_trips, 8000); /* edp temperature margin */ + tegra_add_tj_trips( + loki_soctherm_data.therm[THERM_CPU].trips, + &loki_soctherm_data.therm[THERM_CPU].num_trips); tegra_add_tgpu_trips( loki_soctherm_data.therm[THERM_GPU].trips, &loki_soctherm_data.therm[THERM_GPU].num_trips); 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"); |