diff options
| author | Joshua Primero <jprimero@nvidia.com> | 2012-08-09 16:44:29 -0700 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2012-08-24 18:45:19 -0700 |
| commit | f084ab22d50eb54a5ce04bb711c8c46e2c887e89 (patch) | |
| tree | e1cda11c32c1bc4b48a999eab0ce46f05b26873f /arch/arm/mach-tegra/board-cardhu.c | |
| parent | 290b47bce3418de8bd744aa7d74782c4695155db (diff) | |
ARM: tegra: thermal: Cleaned up thermal framework
Removed shutdown and tc1,tc2,passive delay parameters from
thermal state.
Change-Id: Icd97afaf912a9fb7ab930c95d52d0e1dee42ce5a
Signed-off-by: Joshua Primero <jprimero@nvidia.com>
Reviewed-on: http://git-master/r/124500
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-cardhu.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-cardhu.c | 51 |
1 files changed, 40 insertions, 11 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu.c b/arch/arm/mach-tegra/board-cardhu.c index 7a55f7f502f2..c0b890e1c679 100644 --- a/arch/arm/mach-tegra/board-cardhu.c +++ b/arch/arm/mach-tegra/board-cardhu.c @@ -42,6 +42,7 @@ #include <linux/nfc/pn544.h> #include <linux/rfkill-gpio.h> + #include <sound/wm8903.h> #include <sound/max98095.h> #include <media/tegra_dtv.h> @@ -63,6 +64,7 @@ #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> @@ -82,7 +84,9 @@ static struct balanced_throttle throttle_list[] = { { - .id = BALANCED_THROTTLE_ID_TJ, + .tegra_cdev = { + .id = CDEV_BTHROT_ID_TJ, + }, .throt_tab_size = 10, .throt_tab = { { 0, 1000 }, @@ -99,7 +103,9 @@ static struct balanced_throttle throttle_list[] = { }, #ifdef CONFIG_TEGRA_SKIN_THROTTLE { - .id = BALANCED_THROTTLE_ID_SKIN, + .tegra_cdev = { + .id = CDEV_BTHROT_ID_SKIN, + }, .throt_tab_size = 6, .throt_tab = { { 640000, 1200 }, @@ -115,26 +121,49 @@ static struct balanced_throttle throttle_list[] = { /* All units are in millicelsius */ static struct tegra_thermal_data thermal_data = { - .shutdown_device_id = THERMAL_DEVICE_ID_NCT_EXT, - .temp_shutdown = 90000, .throttle_edp_device_id = THERMAL_DEVICE_ID_NCT_EXT, #ifdef CONFIG_TEGRA_EDP_LIMITS .edp_offset = TDIODE_OFFSET, /* edp based on tdiode */ .hysteresis_edp = 3000, #endif .temp_throttle = 85000, - .tc1 = 0, - .tc2 = 1, - .passive_delay = 2000, + .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, + } + }, +#ifdef CONFIG_TEGRA_SKIN_THROTTLE + /* Skin Thermal Throttling */ + { + .tdev_id = THERMAL_DEVICE_ID_SKIN, + .cdev_id = CDEV_BTHROT_ID_SKIN, + .type = THERMAL_TRIP_PASSIVE, + .passive = { + .trip_temp = 43000, + .tc1 = 10, + .tc2 = 1, + .passive_delay = 15000, + } + }, +#endif + { + .tdev_id = THERMAL_DEVICE_ID_NULL, + }, + }, }; static struct tegra_skin_data skin_data = { #ifdef CONFIG_TEGRA_SKIN_THROTTLE - .skin_device_id = THERMAL_DEVICE_ID_SKIN, + .skin_device_id = THERMAL_DEVICE_ID_THERM_EST_SKIN, .temp_throttle_skin = 43000, - .tc1_skin = 0, - .tc2_skin = 1, - .passive_delay_skin = 5000, .skin_temp_offset = 9793, .skin_period = 1100, .skin_devs_size = 2, |