DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "power: pm8xxx-ccadc: reduce boot time for calibration" into msm-3.0

Browse Source
This commit is contained in:
Linux Build Service Account
2012-02-10 21:50:50 -08:00
committed by QuIC Gerrit Code Review
parent c538fbde96 ccfc4f3abd
commit f187080de1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/power/pm8921-bms.c
View File

@@ -1893,7 +1893,7 @@ static int __devinit pm8921_bms_probe(struct platform_device *pdev)
INIT_DELAYED_WORK(&chip->calib_ccadc_work, calibrate_ccadc_work);
/* begin calibration only on chips > 2.0 */
if (chip->revision >= PM8XXX_REVISION_8921_2p0)
calibrate_ccadc_work(&(chip->calib_ccadc_work.work));
schedule_delayed_work(&chip->calib_ccadc_work, 0);
/* initial hkadc calibration */
schedule_work(&chip->calib_hkadc_work);

4
drivers/power/pm8xxx-ccadc.c
View File

@@ -1,4 +1,4 @@
/* Copyright (c) 2011, Code Aurora Forum. All rights reserved.
/* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -209,7 +209,7 @@ static int calib_start_conv(struct pm8xxx_ccadc_chip *chip,
return rc;
}
if ((reg & (START_CONV_BIT | EOC_CONV_BIT)) != EOC_CONV_BIT)
msleep(60);
msleep(20);
else
break;
}