---

yaml --- r: 363959 b: refs/heads/master c: b763fda h: refs/heads/master i: 363957: 844c663 363955: 40ff9a7 363951: c3ce27c v: v3
git-mirror · Apr 8, 2013 · 7488a58 · 7488a58
1 parent cf8e374
commit 7488a58
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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