From 7488a58a39181381d16f9f34da951f3fa13a9d95 Mon Sep 17 00:00:00 2001 From: Eduardo Valentin Date: Mon, 8 Apr 2013 08:19:10 -0400 Subject: [PATCH] --- yaml --- r: 363959 b: refs/heads/master c: b763fdaeaec8d9bf6c2fc17cac9afd641d9d8c23 h: refs/heads/master i: 363957: 844c663f403a068ce7d3bae6a2585dc3f0bc4976 363955: 40ff9a76aa7f12672fcfaf0fd096cd8fac227552 363951: c3ce27c2c933c54c34f02c78d0caa552e92297c7 v: v3 --- [refs] | 2 +- trunk/drivers/staging/ti-soc-thermal/omap4-thermal-data.c | 8 ++++---- trunk/drivers/staging/ti-soc-thermal/ti-thermal.h | 4 ++++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 7d1fc10d1102..012862cdcbb1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0359090ea72f2ed1465143432252ee0bbad810f7 +refs/heads/master: b763fdaeaec8d9bf6c2fc17cac9afd641d9d8c23 diff --git a/trunk/drivers/staging/ti-soc-thermal/omap4-thermal-data.c b/trunk/drivers/staging/ti-soc-thermal/omap4-thermal-data.c index ee9c90270255..d255d33da9eb 100644 --- a/trunk/drivers/staging/ti-soc-thermal/omap4-thermal-data.c +++ b/trunk/drivers/staging/ti-soc-thermal/omap4-thermal-data.c @@ -82,10 +82,10 @@ const struct ti_bandgap_data omap4430_data = { .registers = &omap4430_mpu_temp_sensor_registers, .ts_data = &omap4430_mpu_temp_sensor_data, .domain = "cpu", - .slope = 0, - .constant = 20000, - .slope_pcb = 0, - .constant_pcb = 20000, + .slope = OMAP_GRADIENT_SLOPE_4430, + .constant = OMAP_GRADIENT_CONST_4430, + .slope_pcb = OMAP_GRADIENT_SLOPE_W_PCB_4430, + .constant_pcb = OMAP_GRADIENT_CONST_W_PCB_4430, .register_cooling = ti_thermal_register_cpu_cooling, .unregister_cooling = ti_thermal_unregister_cpu_cooling, }, diff --git a/trunk/drivers/staging/ti-soc-thermal/ti-thermal.h b/trunk/drivers/staging/ti-soc-thermal/ti-thermal.h index 7b2d600f1352..47cc90267556 100644 --- a/trunk/drivers/staging/ti-soc-thermal/ti-thermal.h +++ b/trunk/drivers/staging/ti-soc-thermal/ti-thermal.h @@ -26,6 +26,8 @@ #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 @@ -37,6 +39,8 @@ #define OMAP_GRADIENT_CONST_5430_GPU 978 /* PCB sensor calculation constants */ +#define OMAP_GRADIENT_SLOPE_W_PCB_4430 0 +#define OMAP_GRADIENT_CONST_W_PCB_4430 20000 #define OMAP_GRADIENT_SLOPE_W_PCB_4460 1142 #define OMAP_GRADIENT_CONST_W_PCB_4460 -393 #define OMAP_GRADIENT_SLOPE_W_PCB_4470 1063