Skip to content

Commit

Permalink
mfd: Correct the name and bitmask for ab8500-gpadc BTempPullUp
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Johan Palsson authored and Samuel Ortiz committed May 26, 2011
1 parent c9c9513 commit ed13941
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/mfd/ab8500-gpadc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit ed13941

Please sign in to comment.