summaryrefslogtreecommitdiffstats
path: root/drivers/iio
diff options
context:
space:
mode:
authorPeter Meerwald-Stadler <pmeerw@pmeerw.net>2017-10-27 21:45:34 +0200
committerJonathan Cameron <Jonathan.Cameron@huawei.com>2017-12-02 10:40:39 +0000
commit7b0b0ec1576e36beb6915c81dec2db9c077270d8 (patch)
tree0109b89f65f516192e36c0e37df337f596f40ca0 /drivers/iio
parentc31c946af81c389febec8a09e627062a6ebd8c88 (diff)
downloadlinux-stable-7b0b0ec1576e36beb6915c81dec2db9c077270d8.tar.gz
linux-stable-7b0b0ec1576e36beb6915c81dec2db9c077270d8.tar.bz2
linux-stable-7b0b0ec1576e36beb6915c81dec2db9c077270d8.zip
iio: health: max30102: Fix mode config values
Table 4 of the datasheet specifies the mode control, these are not individual bits; add multi LED mode Add multi-LED mode and fix MODE_MASK (3 bits wide, not 2) Signed-off-by: Peter Meerwald-Stadler <pmeerw@pmeerw.net> Acked-by: Matt Ranostay <matt.ranostay@konsulko.com> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Diffstat (limited to 'drivers/iio')
-rw-r--r--drivers/iio/health/max30102.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/iio/health/max30102.c b/drivers/iio/health/max30102.c
index 52733ddaf506..bfda1f2f6907 100644
--- a/drivers/iio/health/max30102.c
+++ b/drivers/iio/health/max30102.c
@@ -60,9 +60,10 @@
#define MAX30102_REG_FIFO_CONFIG_AFULL BIT(0)
#define MAX30102_REG_MODE_CONFIG 0x09
-#define MAX30102_REG_MODE_CONFIG_MODE_SPO2_EN BIT(0)
-#define MAX30102_REG_MODE_CONFIG_MODE_HR_EN BIT(1)
-#define MAX30102_REG_MODE_CONFIG_MODE_MASK 0x03
+#define MAX30102_REG_MODE_CONFIG_MODE_HR 0x02 /* red LED */
+#define MAX30102_REG_MODE_CONFIG_MODE_HR_SPO2 0x03 /* red + IR LED */
+#define MAX30102_REG_MODE_CONFIG_MODE_MULTI 0x07 /* multi-LED mode */
+#define MAX30102_REG_MODE_CONFIG_MODE_MASK GENMASK(2, 0)
#define MAX30102_REG_MODE_CONFIG_PWR BIT(7)
#define MAX30102_REG_SPO2_CONFIG 0x0a
@@ -287,11 +288,10 @@ static int max30102_chip_init(struct max30102_data *data)
if (ret)
return ret;
- /* enable SPO2 mode */
+ /* enable HR + SPO2 mode */
ret = regmap_update_bits(data->regmap, MAX30102_REG_MODE_CONFIG,
MAX30102_REG_MODE_CONFIG_MODE_MASK,
- MAX30102_REG_MODE_CONFIG_MODE_HR_EN |
- MAX30102_REG_MODE_CONFIG_MODE_SPO2_EN);
+ MAX30102_REG_MODE_CONFIG_MODE_HR_SPO2);
if (ret)
return ret;