Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-12 07:01:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

lis3: fix show rate for 8 bits chips

Browse Source 
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>
This commit is contained in:
Éric Piel 2009-12-14 18:01:40 -08:00 committed by Linus Torvalds
parent bc62c14717
commit 4b5d95b380
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/hwmon/lis3lv02d.c
View File

@ -127,12 +127,14 @@ void lis3lv02d_poweron(struct lis3lv02d *lis3)
/*
* Common configuration
* BDU: LSB and MSB values are not updated until both have been read.
* So the value read will always be correct.
* BDU: (12 bits sensors only) LSB and MSB values are not updated until
* both have been read. So the value read will always be correct.
*/
lis3->read(lis3, CTRL_REG2, &reg);
reg |= CTRL2_BDU;
lis3->write(lis3, CTRL_REG2, reg);
if (lis3->whoami == WAI_12B) {
lis3->read(lis3, CTRL_REG2, &reg);
reg |= CTRL2_BDU;
lis3->write(lis3, CTRL_REG2, reg);
}
}
EXPORT_SYMBOL_GPL(lis3lv02d_poweron);
@ -363,7 +365,8 @@ static ssize_t lis3lv02d_calibrate_store(struct device *dev,
}
/* conversion btw sampling rate and the register values */
static int lis3lv02dl_df_val[4] = {40, 160, 640, 2560};
static int lis3_12_rates[4] = {40, 160, 640, 2560};
static int lis3_8_rates[2] = {100, 400};
static ssize_t lis3lv02d_rate_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
@ -371,8 +374,13 @@ static ssize_t lis3lv02d_rate_show(struct device *dev,
int val;
lis3_dev.read(&lis3_dev, CTRL_REG1, &ctrl);
val = (ctrl & (CTRL1_DF0 | CTRL1_DF1)) >> 4;
return sprintf(buf, "%d\n", lis3lv02dl_df_val[val]);
if (lis3_dev.whoami == WAI_12B)
val = lis3_12_rates[(ctrl & (CTRL1_DF0 | CTRL1_DF1)) >> 4];
else
val = lis3_8_rates[(ctrl & CTRL1_DR) >> 7];
return sprintf(buf, "%d\n", val);
}
static DEVICE_ATTR(position, S_IRUGO, lis3lv02d_position_show, NULL);

1
drivers/hwmon/lis3lv02d.h
View File

@ -107,6 +107,7 @@ enum lis3lv02d_ctrl1 {
CTRL1_DF1 = 0x20,
CTRL1_PD0 = 0x40,
CTRL1_PD1 = 0x80,
CTRL1_DR = 0x80, /* Data rate on 8 bits */
};
enum lis3lv02d_ctrl2 {
CTRL2_DAS = 0x01,