diff options
| author | Joshua Primero <jprimero@nvidia.com> | 2012-08-29 20:16:22 -0700 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-10-25 15:49:29 -0700 |
| commit | 116efd351b7027cef2f6c16371b3a60e03a68e21 (patch) | |
| tree | d3dbdd55760d24e318097e577554e4254968c7f5 /arch/arm/mach-tegra/board-cardhu.c | |
| parent | ad82083085a6dafe25a67e31186fc3e33a643d35 (diff) | |
ARM: tegra: thermal: Remove tegra therm dependency
Removed the use of the Tegra thermal layer. All management
is now done via Linux thermal framework via thermal_zone_devices
and thermal_cooling_zones.
Change-Id: I87de8a7dd8ff8e338d3c18db1518b5acfc18faee
Signed-off-by: Joshua Primero <jprimero@nvidia.com>
Reviewed-on: http://git-master/r/132883
(cherry picked from commit cb9e0dbe41d7419d6152f02ea10f13faa7448e81)
Signed-off-by: Gaurav Batra <gbatra@nvidia.com>
Reviewed-on: http://git-master/r/130289
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-cardhu.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-cardhu.c | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu.c b/arch/arm/mach-tegra/board-cardhu.c index 8e09c5e27cf5..9ef3c7f932e7 100644 --- a/arch/arm/mach-tegra/board-cardhu.c +++ b/arch/arm/mach-tegra/board-cardhu.c @@ -61,11 +61,9 @@ #include <mach/tegra_asoc_pdata.h> #include <mach/tegra_wm8903_pdata.h> #include <mach/usb_phy.h> -#include <mach/thermal.h> #include <mach/pci.h> #include <mach/gpio-tegra.h> #include <mach/tegra_fiq_debugger.h> -#include <linux/thermal.h> #include <asm/hardware/gic.h> #include <asm/mach-types.h> @@ -84,53 +82,6 @@ #include "wdt-recovery.h" #include "common.h" -static struct balanced_throttle throttle_list[] = { - { - .tegra_cdev = { - .id = CDEV_BTHROT_ID_TJ, - }, - .throt_tab_size = 10, - .throt_tab = { - { 0, 1000 }, - { 640000, 1000 }, - { 640000, 1000 }, - { 640000, 1000 }, - { 640000, 1000 }, - { 640000, 1000 }, - { 760000, 1000 }, - { 760000, 1050 }, - {1000000, 1050 }, - {1000000, 1100 }, - }, - }, -}; - -static struct tegra_thermal_bind thermal_binds[] = { - /* Thermal Throttling */ - { - .tdev_id = THERMAL_DEVICE_ID_NCT_EXT, - .cdev_id = CDEV_BTHROT_ID_TJ, - .type = THERMAL_TRIP_PASSIVE, - .passive = { - .trip_temp = 85000, - .tc1 = 0, - .tc2 = 1, - .passive_delay = 2000, - } - }, - /* EDP Capping */ - { - .tdev_id = THERMAL_DEVICE_ID_NCT_EXT, - .cdev_id = CDEV_EDPTABLE_ID_EDP, - .type = THERMAL_TRIP_ACTIVE, - .get_trip_temp = tegra_edp_get_trip_temp, - .get_trip_size = tegra_edp_get_trip_size, - }, - { - .tdev_id = THERMAL_DEVICE_ID_NULL, - }, -}; - static struct rfkill_gpio_platform_data cardhu_bt_rfkill_pdata[] = { { .name = "bt_rfkill", @@ -1289,7 +1240,6 @@ late_initcall(cardhu_throttle_list_init); static void __init tegra_cardhu_init(void) { - tegra_thermal_init(thermal_binds); tegra_clk_init_from_table(cardhu_clk_init_table); tegra_enable_pinmux(); tegra_smmu_init(); |