diff options
| author | Johan Palsson <johan.palsson@stericsson.com> | 2011-05-08 00:55:43 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-05-26 19:45:44 +0200 |
| commit | ed13941643a437cf48f24ed53bdae79457628105 (patch) | |
| tree | 6cf2a7ba616a46aa9d411df52d065927782e6435 /drivers/mfd/ab8500-gpadc.c | |
| parent | c9c9513fd08d1e0548003e86d70a211c2e456d49 (diff) | |
| download | linux-stable-ed13941643a437cf48f24ed53bdae79457628105.tar.gz linux-stable-ed13941643a437cf48f24ed53bdae79457628105.tar.bz2 linux-stable-ed13941643a437cf48f24ed53bdae79457628105.zip | |
mfd: Correct the name and bitmask for ab8500-gpadc BTempPullUp
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>
Diffstat (limited to 'drivers/mfd/ab8500-gpadc.c')
| -rw-r--r-- | drivers/mfd/ab8500-gpadc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/ab8500-gpadc.c b/drivers/mfd/ab8500-gpadc.c index 82708c1f316d..f16afb234ff9 100644 --- a/drivers/mfd/ab8500-gpadc.c +++ b/drivers/mfd/ab8500-gpadc.c @@ -57,7 +57,7 @@ #define SW_AVG_16 0x60 #define ADC_SW_CONV 0x04 #define EN_ICHAR 0x80 -#define BATTEMP_PULLUP 0x04 +#define BTEMP_PULL_UP 0x08 #define EN_BUF 0x40 #define DIS_ZERO 0x00 #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( gpadc->dev, AB8500_GPADC, AB8500_GPADC_CTRL1_REG, - EN_BUF | BATTEMP_PULLUP, - EN_BUF | BATTEMP_PULLUP); + EN_BUF | BTEMP_PULL_UP, + EN_BUF | BTEMP_PULL_UP); /* * Delay might be needed for ABB8500 cut 3.0, if not, remove |