]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
thermal: arm: dra752: Remove all TSHUT related definitions
authorKeerthy <j-keerthy@ti.com>
Fri, 6 Jan 2017 06:01:43 +0000 (11:31 +0530)
committerEduardo Valentin <edubezval@gmail.com>
Sun, 19 Feb 2017 01:44:18 +0000 (17:44 -0800)
No configuration needs to be done for TSHUT from software.
Hence remove all the unnecessary definitions.

Signed-off-by: Keerthy <j-keerthy@ti.com>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
drivers/thermal/ti-soc-thermal/dra752-bandgap.h
drivers/thermal/ti-soc-thermal/dra752-thermal-data.c

index 6b0f2b1160f76b01de7d4d9e9fc318bf52ef34ee..a31e4b5e82cd9765330ea49a983bfb5048c90965 100644 (file)
@@ -54,7 +54,6 @@
 #define DRA752_STD_FUSE_OPP_BGAP_CORE_OFFSET           0x8
 #define DRA752_TEMP_SENSOR_CORE_OFFSET                 0x154
 #define DRA752_BANDGAP_THRESHOLD_CORE_OFFSET           0x1ac
-#define DRA752_BANDGAP_TSHUT_CORE_OFFSET               0x1b8
 #define DRA752_BANDGAP_CUMUL_DTEMP_CORE_OFFSET         0x1c4
 #define DRA752_DTEMP_CORE_0_OFFSET                     0x208
 #define DRA752_DTEMP_CORE_1_OFFSET                     0x20c
@@ -66,7 +65,6 @@
 #define DRA752_STD_FUSE_OPP_BGAP_IVA_OFFSET            0x388
 #define DRA752_TEMP_SENSOR_IVA_OFFSET                  0x398
 #define DRA752_BANDGAP_THRESHOLD_IVA_OFFSET            0x3a4
-#define DRA752_BANDGAP_TSHUT_IVA_OFFSET                        0x3ac
 #define DRA752_BANDGAP_CUMUL_DTEMP_IVA_OFFSET          0x3b4
 #define DRA752_DTEMP_IVA_0_OFFSET                      0x3d0
 #define DRA752_DTEMP_IVA_1_OFFSET                      0x3d4
@@ -78,7 +76,6 @@
 #define DRA752_STD_FUSE_OPP_BGAP_MPU_OFFSET            0x4
 #define DRA752_TEMP_SENSOR_MPU_OFFSET                  0x14c
 #define DRA752_BANDGAP_THRESHOLD_MPU_OFFSET            0x1a4
-#define DRA752_BANDGAP_TSHUT_MPU_OFFSET                        0x1b0
 #define DRA752_BANDGAP_CUMUL_DTEMP_MPU_OFFSET          0x1bc
 #define DRA752_DTEMP_MPU_0_OFFSET                      0x1e0
 #define DRA752_DTEMP_MPU_1_OFFSET                      0x1e4
@@ -90,7 +87,6 @@
 #define DRA752_STD_FUSE_OPP_BGAP_DSPEVE_OFFSET                 0x384
 #define DRA752_TEMP_SENSOR_DSPEVE_OFFSET                       0x394
 #define DRA752_BANDGAP_THRESHOLD_DSPEVE_OFFSET                 0x3a0
-#define DRA752_BANDGAP_TSHUT_DSPEVE_OFFSET                     0x3a8
 #define DRA752_BANDGAP_CUMUL_DTEMP_DSPEVE_OFFSET               0x3b0
 #define DRA752_DTEMP_DSPEVE_0_OFFSET                           0x3bc
 #define DRA752_DTEMP_DSPEVE_1_OFFSET                           0x3c0
 #define DRA752_STD_FUSE_OPP_BGAP_GPU_OFFSET            0x0
 #define DRA752_TEMP_SENSOR_GPU_OFFSET                  0x150
 #define DRA752_BANDGAP_THRESHOLD_GPU_OFFSET            0x1a8
-#define DRA752_BANDGAP_TSHUT_GPU_OFFSET                        0x1b4
 #define DRA752_BANDGAP_CUMUL_DTEMP_GPU_OFFSET          0x1c0
 #define DRA752_DTEMP_GPU_0_OFFSET                      0x1f4
 #define DRA752_DTEMP_GPU_1_OFFSET                      0x1f8
 #define DRA752_BANDGAP_THRESHOLD_HOT_MASK              (0x3ff << 16)
 #define DRA752_BANDGAP_THRESHOLD_COLD_MASK             (0x3ff << 0)
 
-/* DRA752.TSHUT_THRESHOLD */
-#define DRA752_TSHUT_THRESHOLD_MUXCTRL_MASK            BIT(31)
-#define DRA752_TSHUT_THRESHOLD_HOT_MASK                        (0x3ff << 16)
-#define DRA752_TSHUT_THRESHOLD_COLD_MASK               (0x3ff << 0)
 
 /* DRA752.BANDGAP_CUMUL_DTEMP_CORE */
 #define DRA752_BANDGAP_CUMUL_DTEMP_CORE_MASK           (0xffffffff << 0)
 #define DRA752_GPU_MAX_TEMP                            125000
 #define DRA752_GPU_HYST_VAL                            5000
 /* interrupts thresholds */
-#define DRA752_GPU_TSHUT_HOT                           915
-#define DRA752_GPU_TSHUT_COLD                          900
 #define DRA752_GPU_T_HOT                               800
 #define DRA752_GPU_T_COLD                              795
 
 #define DRA752_MPU_MAX_TEMP                            125000
 #define DRA752_MPU_HYST_VAL                            5000
 /* interrupts thresholds */
-#define DRA752_MPU_TSHUT_HOT                           915
-#define DRA752_MPU_TSHUT_COLD                          900
 #define DRA752_MPU_T_HOT                               800
 #define DRA752_MPU_T_COLD                              795
 
 #define DRA752_CORE_MAX_TEMP                           125000
 #define DRA752_CORE_HYST_VAL                           5000
 /* interrupts thresholds */
-#define DRA752_CORE_TSHUT_HOT                          915
-#define DRA752_CORE_TSHUT_COLD                         900
 #define DRA752_CORE_T_HOT                              800
 #define DRA752_CORE_T_COLD                             795
 
 #define DRA752_DSPEVE_MAX_TEMP                         125000
 #define DRA752_DSPEVE_HYST_VAL                         5000
 /* interrupts thresholds */
-#define DRA752_DSPEVE_TSHUT_HOT                                915
-#define DRA752_DSPEVE_TSHUT_COLD                       900
 #define DRA752_DSPEVE_T_HOT                            800
 #define DRA752_DSPEVE_T_COLD                           795
 
 #define DRA752_IVA_MAX_TEMP                            125000
 #define DRA752_IVA_HYST_VAL                            5000
 /* interrupts thresholds */
-#define DRA752_IVA_TSHUT_HOT                           915
-#define DRA752_IVA_TSHUT_COLD                          900
 #define DRA752_IVA_T_HOT                               800
 #define DRA752_IVA_T_COLD                              795
 
index 0a3f88dd883e072f5a28cc6a2c7344491506c338..118d7d8477155fd947f3735f0fc7674815de9a23 100644 (file)
@@ -49,9 +49,6 @@ dra752_core_temp_sensor_registers = {
        .bgap_threshold = DRA752_BANDGAP_THRESHOLD_CORE_OFFSET,
        .threshold_thot_mask = DRA752_BANDGAP_THRESHOLD_HOT_MASK,
        .threshold_tcold_mask = DRA752_BANDGAP_THRESHOLD_COLD_MASK,
-       .tshut_threshold = DRA752_BANDGAP_TSHUT_CORE_OFFSET,
-       .tshut_hot_mask = DRA752_TSHUT_THRESHOLD_HOT_MASK,
-       .tshut_cold_mask = DRA752_TSHUT_THRESHOLD_COLD_MASK,
        .bgap_status = DRA752_BANDGAP_STATUS_1_OFFSET,
        .status_bgap_alert_mask = DRA752_BANDGAP_STATUS_1_ALERT_MASK,
        .status_hot_mask = DRA752_BANDGAP_STATUS_1_HOT_CORE_MASK,
@@ -85,9 +82,6 @@ dra752_iva_temp_sensor_registers = {
        .bgap_threshold = DRA752_BANDGAP_THRESHOLD_IVA_OFFSET,
        .threshold_thot_mask = DRA752_BANDGAP_THRESHOLD_HOT_MASK,
        .threshold_tcold_mask = DRA752_BANDGAP_THRESHOLD_COLD_MASK,
-       .tshut_threshold = DRA752_BANDGAP_TSHUT_IVA_OFFSET,
-       .tshut_hot_mask = DRA752_TSHUT_THRESHOLD_HOT_MASK,
-       .tshut_cold_mask = DRA752_TSHUT_THRESHOLD_COLD_MASK,
        .bgap_status = DRA752_BANDGAP_STATUS_2_OFFSET,
        .status_bgap_alert_mask = DRA752_BANDGAP_STATUS_1_ALERT_MASK,
        .status_hot_mask = DRA752_BANDGAP_STATUS_2_HOT_IVA_MASK,
@@ -121,9 +115,6 @@ dra752_mpu_temp_sensor_registers = {
        .bgap_threshold = DRA752_BANDGAP_THRESHOLD_MPU_OFFSET,
        .threshold_thot_mask = DRA752_BANDGAP_THRESHOLD_HOT_MASK,
        .threshold_tcold_mask = DRA752_BANDGAP_THRESHOLD_COLD_MASK,
-       .tshut_threshold = DRA752_BANDGAP_TSHUT_MPU_OFFSET,
-       .tshut_hot_mask = DRA752_TSHUT_THRESHOLD_HOT_MASK,
-       .tshut_cold_mask = DRA752_TSHUT_THRESHOLD_COLD_MASK,
        .bgap_status = DRA752_BANDGAP_STATUS_1_OFFSET,
        .status_bgap_alert_mask = DRA752_BANDGAP_STATUS_1_ALERT_MASK,
        .status_hot_mask = DRA752_BANDGAP_STATUS_1_HOT_MPU_MASK,
@@ -157,9 +148,6 @@ dra752_dspeve_temp_sensor_registers = {
        .bgap_threshold = DRA752_BANDGAP_THRESHOLD_DSPEVE_OFFSET,
        .threshold_thot_mask = DRA752_BANDGAP_THRESHOLD_HOT_MASK,
        .threshold_tcold_mask = DRA752_BANDGAP_THRESHOLD_COLD_MASK,
-       .tshut_threshold = DRA752_BANDGAP_TSHUT_DSPEVE_OFFSET,
-       .tshut_hot_mask = DRA752_TSHUT_THRESHOLD_HOT_MASK,
-       .tshut_cold_mask = DRA752_TSHUT_THRESHOLD_COLD_MASK,
        .bgap_status = DRA752_BANDGAP_STATUS_2_OFFSET,
        .status_bgap_alert_mask = DRA752_BANDGAP_STATUS_1_ALERT_MASK,
        .status_hot_mask = DRA752_BANDGAP_STATUS_2_HOT_DSPEVE_MASK,
@@ -193,9 +181,6 @@ dra752_gpu_temp_sensor_registers = {
        .bgap_threshold = DRA752_BANDGAP_THRESHOLD_GPU_OFFSET,
        .threshold_thot_mask = DRA752_BANDGAP_THRESHOLD_HOT_MASK,
        .threshold_tcold_mask = DRA752_BANDGAP_THRESHOLD_COLD_MASK,
-       .tshut_threshold = DRA752_BANDGAP_TSHUT_GPU_OFFSET,
-       .tshut_hot_mask = DRA752_TSHUT_THRESHOLD_HOT_MASK,
-       .tshut_cold_mask = DRA752_TSHUT_THRESHOLD_COLD_MASK,
        .bgap_status = DRA752_BANDGAP_STATUS_1_OFFSET,
        .status_bgap_alert_mask = DRA752_BANDGAP_STATUS_1_ALERT_MASK,
        .status_hot_mask = DRA752_BANDGAP_STATUS_1_HOT_GPU_MASK,
@@ -211,8 +196,6 @@ dra752_gpu_temp_sensor_registers = {
 
 /* Thresholds and limits for DRA752 MPU temperature sensor */
 static struct temp_sensor_data dra752_mpu_temp_sensor_data = {
-       .tshut_hot = DRA752_MPU_TSHUT_HOT,
-       .tshut_cold = DRA752_MPU_TSHUT_COLD,
        .t_hot = DRA752_MPU_T_HOT,
        .t_cold = DRA752_MPU_T_COLD,
        .min_freq = DRA752_MPU_MIN_FREQ,
@@ -226,8 +209,6 @@ static struct temp_sensor_data dra752_mpu_temp_sensor_data = {
 
 /* Thresholds and limits for DRA752 GPU temperature sensor */
 static struct temp_sensor_data dra752_gpu_temp_sensor_data = {
-       .tshut_hot = DRA752_GPU_TSHUT_HOT,
-       .tshut_cold = DRA752_GPU_TSHUT_COLD,
        .t_hot = DRA752_GPU_T_HOT,
        .t_cold = DRA752_GPU_T_COLD,
        .min_freq = DRA752_GPU_MIN_FREQ,
@@ -241,8 +222,6 @@ static struct temp_sensor_data dra752_gpu_temp_sensor_data = {
 
 /* Thresholds and limits for DRA752 CORE temperature sensor */
 static struct temp_sensor_data dra752_core_temp_sensor_data = {
-       .tshut_hot = DRA752_CORE_TSHUT_HOT,
-       .tshut_cold = DRA752_CORE_TSHUT_COLD,
        .t_hot = DRA752_CORE_T_HOT,
        .t_cold = DRA752_CORE_T_COLD,
        .min_freq = DRA752_CORE_MIN_FREQ,
@@ -256,8 +235,6 @@ static struct temp_sensor_data dra752_core_temp_sensor_data = {
 
 /* Thresholds and limits for DRA752 DSPEVE temperature sensor */
 static struct temp_sensor_data dra752_dspeve_temp_sensor_data = {
-       .tshut_hot = DRA752_DSPEVE_TSHUT_HOT,
-       .tshut_cold = DRA752_DSPEVE_TSHUT_COLD,
        .t_hot = DRA752_DSPEVE_T_HOT,
        .t_cold = DRA752_DSPEVE_T_COLD,
        .min_freq = DRA752_DSPEVE_MIN_FREQ,
@@ -271,8 +248,6 @@ static struct temp_sensor_data dra752_dspeve_temp_sensor_data = {
 
 /* Thresholds and limits for DRA752 IVA temperature sensor */
 static struct temp_sensor_data dra752_iva_temp_sensor_data = {
-       .tshut_hot = DRA752_IVA_TSHUT_HOT,
-       .tshut_cold = DRA752_IVA_TSHUT_COLD,
        .t_hot = DRA752_IVA_T_HOT,
        .t_cold = DRA752_IVA_T_COLD,
        .min_freq = DRA752_IVA_MIN_FREQ,