android/android_kernel_cmhtcleo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "htcleo: add new battery temperature table"

Browse Source 
This reverts commit 53a7287c1b52667b8e3f236e69e55c7b68a5373b.
This commit is contained in:
Markinus 2010-11-14 16:39:53 +01:00
parent 4d523a124b
commit 9b7f42ceee
3 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-msm/board-htcleo.c
View File

@ -739,7 +739,7 @@ static struct platform_device htc_battery_pdev = {
static int get_thermal_id(void)
{
return THERMAL_600;
return THERMAL_300;
}
static struct ds2746_platform_data ds2746_pdev_data = {

5
drivers/power/ds2746_param.c
View File

@ -843,10 +843,7 @@ void battery_param_init(struct battery_type *battery)
if (battery->thermal_id == THERMAL_1000) {
TEMP_MAP = TEMP_MAP_1000K;
printk(DRIVER_ZONE "Use 1000 Kohm thermal resistance");
} else if (battery->thermal_id == THERMAL_600) {
TEMP_MAP = TEMP_MAP_600K;
printk(DRIVER_ZONE "Use 600 Kohm thermal resistance");
} else {
} else {
printk(DRIVER_ZONE "Use default(300 Kohm) thermal resistance");
}

12
include/linux/ds2746_param_config.h
View File

@ -71,17 +71,6 @@ UINT32 TEMP_MAP_300K[] =
1406, 1433, 2047,
};
UINT32 TEMP_MAP_600K[] =
{
0,56,59,60,63,65,68,70,73,75,78,81,84,87,91,94,98,
102,105,110,114,118,123,128,133,138,144,149,156,161,
168,175,181,189,197,205,213,222,231,240,250,260,270,
281,293,304,317,329,343,356,371,385,401,417,433,450,
467,486,504,523,543,563,584,616,628,650,674,697,721,
746,772,798,824,851,878,906,934,962,991,1020,
1050,1079,2047,
};
UINT32 TEMP_MAP_1000K[] =
{
0, 30, 31, 32, 34, 35, 36, 38, 39, 40,
@ -95,7 +84,6 @@ UINT32 TEMP_MAP_1000K[] =
812, 843, 2047,
};
UINT32 *TEMP_MAP = TEMP_MAP_300K;
UINT32 FL_25[] =