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

mfd: Correct the name and bitmask for ab8500-gpadc BTempPullUp

Browse Source 
The bitmask for enabling the BatTemp pull-up was wrong and
is corrected. The name is also changed to be inline with
the AB8500 register description

Signed-off-by: Johan Palsson <johan.palsson@stericsson.com>
Reviewed-by: Mattias Wallin <mattias.wallin@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Johan Palsson
2011-05-08 00:55:43 +02:00
committed by Samuel Ortiz
parent c9c9513fd0
commit ed13941643
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mfd/ab8500-gpadc.c
View File

@@ -57,7 +57,7 @@
#define SW_AVG_16 0x60 #define SW_AVG_16 0x60
#define ADC_SW_CONV 0x04 #define ADC_SW_CONV 0x04
#define EN_ICHAR 0x80 #define EN_ICHAR 0x80
#define BATTEMP_PULLUP 0x04 #define BTEMP_PULL_UP 0x08
#define EN_BUF 0x40 #define EN_BUF 0x40
#define DIS_ZERO 0x00 #define DIS_ZERO 0x00
#define GPADC_BUSY 0x01 #define GPADC_BUSY 0x01
@@ -306,8 +306,8 @@ int ab8500_gpadc_convert(struct ab8500_gpadc *gpadc, u8 input)
ret = abx500_mask_and_set_register_interruptible( ret = abx500_mask_and_set_register_interruptible(
gpadc->dev, gpadc->dev,
AB8500_GPADC, AB8500_GPADC_CTRL1_REG, AB8500_GPADC, AB8500_GPADC_CTRL1_REG,
EN_BUF | BATTEMP_PULLUP, EN_BUF | BTEMP_PULL_UP,
EN_BUF | BATTEMP_PULLUP); EN_BUF | BTEMP_PULL_UP);
/* /*
* Delay might be needed for ABB8500 cut 3.0, if not, remove * Delay might be needed for ABB8500 cut 3.0, if not, remove