Commit 004f7728 authored by Keerthy's avatar Keerthy Committed by Eduardo Valentin

thermal: ti-soc-thermal: Remove redundant constants

Now that slope and offset data are being passed from
device tree no need to populate in driver data.
Signed-off-by: default avatarKeerthy <j-keerthy@ti.com>
Signed-off-by: default avatarEduardo Valentin <edubezval@gmail.com>
parent e7d22fd2
...@@ -410,8 +410,6 @@ const struct ti_bandgap_data dra752_data = { ...@@ -410,8 +410,6 @@ const struct ti_bandgap_data dra752_data = {
.domain = "cpu", .domain = "cpu",
.register_cooling = ti_thermal_register_cpu_cooling, .register_cooling = ti_thermal_register_cpu_cooling,
.unregister_cooling = ti_thermal_unregister_cpu_cooling, .unregister_cooling = ti_thermal_unregister_cpu_cooling,
.slope = DRA752_GRADIENT_SLOPE,
.constant = DRA752_GRADIENT_CONST,
.slope_pcb = DRA752_GRADIENT_SLOPE_W_PCB, .slope_pcb = DRA752_GRADIENT_SLOPE_W_PCB,
.constant_pcb = DRA752_GRADIENT_CONST_W_PCB, .constant_pcb = DRA752_GRADIENT_CONST_W_PCB,
}, },
...@@ -419,8 +417,6 @@ const struct ti_bandgap_data dra752_data = { ...@@ -419,8 +417,6 @@ const struct ti_bandgap_data dra752_data = {
.registers = &dra752_gpu_temp_sensor_registers, .registers = &dra752_gpu_temp_sensor_registers,
.ts_data = &dra752_gpu_temp_sensor_data, .ts_data = &dra752_gpu_temp_sensor_data,
.domain = "gpu", .domain = "gpu",
.slope = DRA752_GRADIENT_SLOPE,
.constant = DRA752_GRADIENT_CONST,
.slope_pcb = DRA752_GRADIENT_SLOPE_W_PCB, .slope_pcb = DRA752_GRADIENT_SLOPE_W_PCB,
.constant_pcb = DRA752_GRADIENT_CONST_W_PCB, .constant_pcb = DRA752_GRADIENT_CONST_W_PCB,
}, },
...@@ -428,8 +424,6 @@ const struct ti_bandgap_data dra752_data = { ...@@ -428,8 +424,6 @@ const struct ti_bandgap_data dra752_data = {
.registers = &dra752_core_temp_sensor_registers, .registers = &dra752_core_temp_sensor_registers,
.ts_data = &dra752_core_temp_sensor_data, .ts_data = &dra752_core_temp_sensor_data,
.domain = "core", .domain = "core",
.slope = DRA752_GRADIENT_SLOPE,
.constant = DRA752_GRADIENT_CONST,
.slope_pcb = DRA752_GRADIENT_SLOPE_W_PCB, .slope_pcb = DRA752_GRADIENT_SLOPE_W_PCB,
.constant_pcb = DRA752_GRADIENT_CONST_W_PCB, .constant_pcb = DRA752_GRADIENT_CONST_W_PCB,
}, },
...@@ -437,8 +431,6 @@ const struct ti_bandgap_data dra752_data = { ...@@ -437,8 +431,6 @@ const struct ti_bandgap_data dra752_data = {
.registers = &dra752_dspeve_temp_sensor_registers, .registers = &dra752_dspeve_temp_sensor_registers,
.ts_data = &dra752_dspeve_temp_sensor_data, .ts_data = &dra752_dspeve_temp_sensor_data,
.domain = "dspeve", .domain = "dspeve",
.slope = DRA752_GRADIENT_SLOPE,
.constant = DRA752_GRADIENT_CONST,
.slope_pcb = DRA752_GRADIENT_SLOPE_W_PCB, .slope_pcb = DRA752_GRADIENT_SLOPE_W_PCB,
.constant_pcb = DRA752_GRADIENT_CONST_W_PCB, .constant_pcb = DRA752_GRADIENT_CONST_W_PCB,
}, },
...@@ -446,8 +438,6 @@ const struct ti_bandgap_data dra752_data = { ...@@ -446,8 +438,6 @@ const struct ti_bandgap_data dra752_data = {
.registers = &dra752_iva_temp_sensor_registers, .registers = &dra752_iva_temp_sensor_registers,
.ts_data = &dra752_iva_temp_sensor_data, .ts_data = &dra752_iva_temp_sensor_data,
.domain = "iva", .domain = "iva",
.slope = DRA752_GRADIENT_SLOPE,
.constant = DRA752_GRADIENT_CONST,
.slope_pcb = DRA752_GRADIENT_SLOPE_W_PCB, .slope_pcb = DRA752_GRADIENT_SLOPE_W_PCB,
.constant_pcb = DRA752_GRADIENT_CONST_W_PCB, .constant_pcb = DRA752_GRADIENT_CONST_W_PCB,
}, },
......
...@@ -91,8 +91,6 @@ const struct ti_bandgap_data omap34xx_data = { ...@@ -91,8 +91,6 @@ const struct ti_bandgap_data omap34xx_data = {
.registers = &omap34xx_mpu_temp_sensor_registers, .registers = &omap34xx_mpu_temp_sensor_registers,
.ts_data = &omap34xx_mpu_temp_sensor_data, .ts_data = &omap34xx_mpu_temp_sensor_data,
.domain = "cpu", .domain = "cpu",
.slope = 0,
.constant = 20000,
.slope_pcb = 0, .slope_pcb = 0,
.constant_pcb = 20000, .constant_pcb = 20000,
.register_cooling = NULL, .register_cooling = NULL,
...@@ -164,8 +162,6 @@ const struct ti_bandgap_data omap36xx_data = { ...@@ -164,8 +162,6 @@ const struct ti_bandgap_data omap36xx_data = {
.registers = &omap36xx_mpu_temp_sensor_registers, .registers = &omap36xx_mpu_temp_sensor_registers,
.ts_data = &omap36xx_mpu_temp_sensor_data, .ts_data = &omap36xx_mpu_temp_sensor_data,
.domain = "cpu", .domain = "cpu",
.slope = 0,
.constant = 20000,
.slope_pcb = 0, .slope_pcb = 0,
.constant_pcb = 20000, .constant_pcb = 20000,
.register_cooling = NULL, .register_cooling = NULL,
......
...@@ -82,8 +82,6 @@ const struct ti_bandgap_data omap4430_data = { ...@@ -82,8 +82,6 @@ const struct ti_bandgap_data omap4430_data = {
.registers = &omap4430_mpu_temp_sensor_registers, .registers = &omap4430_mpu_temp_sensor_registers,
.ts_data = &omap4430_mpu_temp_sensor_data, .ts_data = &omap4430_mpu_temp_sensor_data,
.domain = "cpu", .domain = "cpu",
.slope = OMAP_GRADIENT_SLOPE_4430,
.constant = OMAP_GRADIENT_CONST_4430,
.slope_pcb = OMAP_GRADIENT_SLOPE_W_PCB_4430, .slope_pcb = OMAP_GRADIENT_SLOPE_W_PCB_4430,
.constant_pcb = OMAP_GRADIENT_CONST_W_PCB_4430, .constant_pcb = OMAP_GRADIENT_CONST_W_PCB_4430,
.register_cooling = ti_thermal_register_cpu_cooling, .register_cooling = ti_thermal_register_cpu_cooling,
...@@ -222,8 +220,6 @@ const struct ti_bandgap_data omap4460_data = { ...@@ -222,8 +220,6 @@ const struct ti_bandgap_data omap4460_data = {
.registers = &omap4460_mpu_temp_sensor_registers, .registers = &omap4460_mpu_temp_sensor_registers,
.ts_data = &omap4460_mpu_temp_sensor_data, .ts_data = &omap4460_mpu_temp_sensor_data,
.domain = "cpu", .domain = "cpu",
.slope = OMAP_GRADIENT_SLOPE_4460,
.constant = OMAP_GRADIENT_CONST_4460,
.slope_pcb = OMAP_GRADIENT_SLOPE_W_PCB_4460, .slope_pcb = OMAP_GRADIENT_SLOPE_W_PCB_4460,
.constant_pcb = OMAP_GRADIENT_CONST_W_PCB_4460, .constant_pcb = OMAP_GRADIENT_CONST_W_PCB_4460,
.register_cooling = ti_thermal_register_cpu_cooling, .register_cooling = ti_thermal_register_cpu_cooling,
...@@ -255,8 +251,6 @@ const struct ti_bandgap_data omap4470_data = { ...@@ -255,8 +251,6 @@ const struct ti_bandgap_data omap4470_data = {
.registers = &omap4460_mpu_temp_sensor_registers, .registers = &omap4460_mpu_temp_sensor_registers,
.ts_data = &omap4460_mpu_temp_sensor_data, .ts_data = &omap4460_mpu_temp_sensor_data,
.domain = "cpu", .domain = "cpu",
.slope = OMAP_GRADIENT_SLOPE_4470,
.constant = OMAP_GRADIENT_CONST_4470,
.slope_pcb = OMAP_GRADIENT_SLOPE_W_PCB_4470, .slope_pcb = OMAP_GRADIENT_SLOPE_W_PCB_4470,
.constant_pcb = OMAP_GRADIENT_CONST_W_PCB_4470, .constant_pcb = OMAP_GRADIENT_CONST_W_PCB_4470,
.register_cooling = ti_thermal_register_cpu_cooling, .register_cooling = ti_thermal_register_cpu_cooling,
......
...@@ -336,8 +336,6 @@ const struct ti_bandgap_data omap5430_data = { ...@@ -336,8 +336,6 @@ const struct ti_bandgap_data omap5430_data = {
.domain = "cpu", .domain = "cpu",
.register_cooling = ti_thermal_register_cpu_cooling, .register_cooling = ti_thermal_register_cpu_cooling,
.unregister_cooling = ti_thermal_unregister_cpu_cooling, .unregister_cooling = ti_thermal_unregister_cpu_cooling,
.slope = OMAP_GRADIENT_SLOPE_5430_CPU,
.constant = OMAP_GRADIENT_CONST_5430_CPU,
.slope_pcb = OMAP_GRADIENT_SLOPE_W_PCB_5430_CPU, .slope_pcb = OMAP_GRADIENT_SLOPE_W_PCB_5430_CPU,
.constant_pcb = OMAP_GRADIENT_CONST_W_PCB_5430_CPU, .constant_pcb = OMAP_GRADIENT_CONST_W_PCB_5430_CPU,
}, },
...@@ -345,8 +343,6 @@ const struct ti_bandgap_data omap5430_data = { ...@@ -345,8 +343,6 @@ const struct ti_bandgap_data omap5430_data = {
.registers = &omap5430_gpu_temp_sensor_registers, .registers = &omap5430_gpu_temp_sensor_registers,
.ts_data = &omap5430_gpu_temp_sensor_data, .ts_data = &omap5430_gpu_temp_sensor_data,
.domain = "gpu", .domain = "gpu",
.slope = OMAP_GRADIENT_SLOPE_5430_GPU,
.constant = OMAP_GRADIENT_CONST_5430_GPU,
.slope_pcb = OMAP_GRADIENT_SLOPE_W_PCB_5430_GPU, .slope_pcb = OMAP_GRADIENT_SLOPE_W_PCB_5430_GPU,
.constant_pcb = OMAP_GRADIENT_CONST_W_PCB_5430_GPU, .constant_pcb = OMAP_GRADIENT_CONST_W_PCB_5430_GPU,
}, },
......
...@@ -254,8 +254,6 @@ struct ti_bandgap { ...@@ -254,8 +254,6 @@ struct ti_bandgap {
* @ts_data: pointer to struct with thresholds, limits of temperature sensor * @ts_data: pointer to struct with thresholds, limits of temperature sensor
* @registers: pointer to the list of register offsets and bitfields * @registers: pointer to the list of register offsets and bitfields
* @domain: the name of the domain where the sensor is located * @domain: the name of the domain where the sensor is located
* @slope: sensor gradient slope info for hotspot extrapolation equation
* @constant: sensor gradient const info for hotspot extrapolation equation
* @slope_pcb: sensor gradient slope info for hotspot extrapolation equation * @slope_pcb: sensor gradient slope info for hotspot extrapolation equation
* with no external influence * with no external influence
* @constant_pcb: sensor gradient const info for hotspot extrapolation equation * @constant_pcb: sensor gradient const info for hotspot extrapolation equation
...@@ -274,8 +272,6 @@ struct ti_temp_sensor { ...@@ -274,8 +272,6 @@ struct ti_temp_sensor {
struct temp_sensor_registers *registers; struct temp_sensor_registers *registers;
char *domain; char *domain;
/* for hotspot extrapolation */ /* for hotspot extrapolation */
const int slope;
const int constant;
const int slope_pcb; const int slope_pcb;
const int constant_pcb; const int constant_pcb;
int (*register_cooling)(struct ti_bandgap *bgp, int id); int (*register_cooling)(struct ti_bandgap *bgp, int id);
......
...@@ -25,22 +25,6 @@ ...@@ -25,22 +25,6 @@
#include "ti-bandgap.h" #include "ti-bandgap.h"
/* sensors gradient and offsets */
#define OMAP_GRADIENT_SLOPE_4430 0
#define OMAP_GRADIENT_CONST_4430 20000
#define OMAP_GRADIENT_SLOPE_4460 348
#define OMAP_GRADIENT_CONST_4460 -9301
#define OMAP_GRADIENT_SLOPE_4470 308
#define OMAP_GRADIENT_CONST_4470 -7896
#define OMAP_GRADIENT_SLOPE_5430_CPU 65
#define OMAP_GRADIENT_CONST_5430_CPU -1791
#define OMAP_GRADIENT_SLOPE_5430_GPU 117
#define OMAP_GRADIENT_CONST_5430_GPU -2992
#define DRA752_GRADIENT_SLOPE 0
#define DRA752_GRADIENT_CONST 2000
/* PCB sensor calculation constants */ /* PCB sensor calculation constants */
#define OMAP_GRADIENT_SLOPE_W_PCB_4430 0 #define OMAP_GRADIENT_SLOPE_W_PCB_4430 0
#define OMAP_GRADIENT_CONST_W_PCB_4430 20000 #define OMAP_GRADIENT_CONST_W_PCB_4430 20000
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment