diff options
author | Zhang Rui <rui.zhang@intel.com> | 2017-05-06 13:31:19 +0200 |
---|---|---|
committer | Zhang Rui <rui.zhang@intel.com> | 2017-05-06 13:31:19 +0200 |
commit | cb15c81a0c1c1f7829b9809a209ecacc77f5aa63 (patch) | |
tree | 165f3a46c4d72ba5b1f517276f2026bec69a2d9b /drivers/thermal/ti-soc-thermal/omap5-thermal-data.c | |
parent | Merge branch 'backup-thermal-shutdown' into next (diff) | |
parent | Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalent... (diff) | |
download | linux-cb15c81a0c1c1f7829b9809a209ecacc77f5aa63.tar.xz linux-cb15c81a0c1c1f7829b9809a209ecacc77f5aa63.zip |
Merge branch 'thermal-soc' into next
Diffstat (limited to 'drivers/thermal/ti-soc-thermal/omap5-thermal-data.c')
-rw-r--r-- | drivers/thermal/ti-soc-thermal/omap5-thermal-data.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/thermal/ti-soc-thermal/omap5-thermal-data.c b/drivers/thermal/ti-soc-thermal/omap5-thermal-data.c index 79ff70c446ba..cd9a304fb571 100644 --- a/drivers/thermal/ti-soc-thermal/omap5-thermal-data.c +++ b/drivers/thermal/ti-soc-thermal/omap5-thermal-data.c @@ -336,8 +336,6 @@ const struct ti_bandgap_data omap5430_data = { .domain = "cpu", .register_cooling = ti_thermal_register_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, .constant_pcb = OMAP_GRADIENT_CONST_W_PCB_5430_CPU, }, @@ -345,8 +343,6 @@ const struct ti_bandgap_data omap5430_data = { .registers = &omap5430_gpu_temp_sensor_registers, .ts_data = &omap5430_gpu_temp_sensor_data, .domain = "gpu", - .slope = OMAP_GRADIENT_SLOPE_5430_GPU, - .constant = OMAP_GRADIENT_CONST_5430_GPU, .slope_pcb = OMAP_GRADIENT_SLOPE_W_PCB_5430_GPU, .constant_pcb = OMAP_GRADIENT_CONST_W_PCB_5430_GPU, }, |