Commit 4b5d95b3809bcd77599122494aa3f575cd6ab1b9
Committed by
Linus Torvalds
Linus Torvalds
1 parent
bc62c14717
Exists in
master
and in
7 other branches
lis3: fix show rate for 8 bits chips
Originally the driver was only targeted to 12bits sensors. When support for 8bits sensors was added, some slight difference in the registers were overlooked. This should fix it, both for initialization, and for displaying the rate. Reported-by: Kalhan Trisal <kalhan.trisal@intel.com> Reported-by: Christoph Plattner <christoph.plattner@gmx.at> Tested-by: Christoph Plattner <christoph.plattner@gmx.at> Tested-by: Samu Onkalo <samu.p.onkalo@nokia.com> Signed-off-by: Éric Piel <eric.piel@tremplin-utc.net> Signed-off-by: Samu Onkalo <samu.p.onkalo@nokia.com> Cc: Pavel Machek <pavel@ucw.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 2 changed files with 17 additions and 8 deletions Side-by-side Diff
drivers/hwmon/lis3lv02d.c
| ... | ... | @@ -127,12 +127,14 @@ |
| 127 | 127 | |
| 128 | 128 | /* |
| 129 | 129 | * Common configuration |
| 130 | - * BDU: LSB and MSB values are not updated until both have been read. | |
| 131 | - * So the value read will always be correct. | |
| 130 | + * BDU: (12 bits sensors only) LSB and MSB values are not updated until | |
| 131 | + * both have been read. So the value read will always be correct. | |
| 132 | 132 | */ |
| 133 | - lis3->read(lis3, CTRL_REG2, ®); | |
| 134 | - reg |= CTRL2_BDU; | |
| 135 | - lis3->write(lis3, CTRL_REG2, reg); | |
| 133 | + if (lis3->whoami == WAI_12B) { | |
| 134 | + lis3->read(lis3, CTRL_REG2, ®); | |
| 135 | + reg |= CTRL2_BDU; | |
| 136 | + lis3->write(lis3, CTRL_REG2, reg); | |
| 137 | + } | |
| 136 | 138 | } |
| 137 | 139 | EXPORT_SYMBOL_GPL(lis3lv02d_poweron); |
| 138 | 140 | |
| ... | ... | @@ -363,7 +365,8 @@ |
| 363 | 365 | } |
| 364 | 366 | |
| 365 | 367 | /* conversion btw sampling rate and the register values */ |
| 366 | -static int lis3lv02dl_df_val[4] = {40, 160, 640, 2560}; | |
| 368 | +static int lis3_12_rates[4] = {40, 160, 640, 2560}; | |
| 369 | +static int lis3_8_rates[2] = {100, 400}; | |
| 367 | 370 | static ssize_t lis3lv02d_rate_show(struct device *dev, |
| 368 | 371 | struct device_attribute *attr, char *buf) |
| 369 | 372 | { |
| ... | ... | @@ -371,8 +374,13 @@ |
| 371 | 374 | int val; |
| 372 | 375 | |
| 373 | 376 | lis3_dev.read(&lis3_dev, CTRL_REG1, &ctrl); |
| 374 | - val = (ctrl & (CTRL1_DF0 | CTRL1_DF1)) >> 4; | |
| 375 | - return sprintf(buf, "%d\n", lis3lv02dl_df_val[val]); | |
| 377 | + | |
| 378 | + if (lis3_dev.whoami == WAI_12B) | |
| 379 | + val = lis3_12_rates[(ctrl & (CTRL1_DF0 | CTRL1_DF1)) >> 4]; | |
| 380 | + else | |
| 381 | + val = lis3_8_rates[(ctrl & CTRL1_DR) >> 7]; | |
| 382 | + | |
| 383 | + return sprintf(buf, "%d\n", val); | |
| 376 | 384 | } |
| 377 | 385 | |
| 378 | 386 | static DEVICE_ATTR(position, S_IRUGO, lis3lv02d_position_show, NULL); |