mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 22:26:55 +00:00
iio: light: apds9960: fix wrong register for gesture gain
Gesture Gain Control is in REG_GCONF_2 (0xa3), not in REG_CONFIG_2 (0x90).
Fixes: aff268cd53
("iio: light: add APDS9960 ALS + promixity driver")
Signed-off-by: Alejandro Concepcion-Rodriguez <asconcepcion@acoro.eu>
Acked-by: Matt Ranostay <matt.ranostay@konsulko.com>
Cc: <Stable@vger.kernel.org>
Link: https://lore.kernel.org/r/EaT-NKC-H4DNX5z4Lg9B6IWPD5TrTrYBr5DYB784wfDKQkTmzPXkoYqyUOrOgJH-xvTsEkFLcVkeAPZRUODEFI5dGziaWXwjpfBNLeNGfNc=@acoro.eu
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
parent
38e9f21f64
commit
0aa60ff5d9
1 changed files with 6 additions and 6 deletions
|
@ -54,9 +54,6 @@
|
||||||
#define APDS9960_REG_CONTROL_PGAIN_MASK_SHIFT 2
|
#define APDS9960_REG_CONTROL_PGAIN_MASK_SHIFT 2
|
||||||
|
|
||||||
#define APDS9960_REG_CONFIG_2 0x90
|
#define APDS9960_REG_CONFIG_2 0x90
|
||||||
#define APDS9960_REG_CONFIG_2_GGAIN_MASK 0x60
|
|
||||||
#define APDS9960_REG_CONFIG_2_GGAIN_MASK_SHIFT 5
|
|
||||||
|
|
||||||
#define APDS9960_REG_ID 0x92
|
#define APDS9960_REG_ID 0x92
|
||||||
|
|
||||||
#define APDS9960_REG_STATUS 0x93
|
#define APDS9960_REG_STATUS 0x93
|
||||||
|
@ -77,6 +74,9 @@
|
||||||
#define APDS9960_REG_GCONF_1_GFIFO_THRES_MASK_SHIFT 6
|
#define APDS9960_REG_GCONF_1_GFIFO_THRES_MASK_SHIFT 6
|
||||||
|
|
||||||
#define APDS9960_REG_GCONF_2 0xa3
|
#define APDS9960_REG_GCONF_2 0xa3
|
||||||
|
#define APDS9960_REG_GCONF_2_GGAIN_MASK 0x60
|
||||||
|
#define APDS9960_REG_GCONF_2_GGAIN_MASK_SHIFT 5
|
||||||
|
|
||||||
#define APDS9960_REG_GOFFSET_U 0xa4
|
#define APDS9960_REG_GOFFSET_U 0xa4
|
||||||
#define APDS9960_REG_GOFFSET_D 0xa5
|
#define APDS9960_REG_GOFFSET_D 0xa5
|
||||||
#define APDS9960_REG_GPULSE 0xa6
|
#define APDS9960_REG_GPULSE 0xa6
|
||||||
|
@ -396,9 +396,9 @@ static int apds9960_set_pxs_gain(struct apds9960_data *data, int val)
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = regmap_update_bits(data->regmap,
|
ret = regmap_update_bits(data->regmap,
|
||||||
APDS9960_REG_CONFIG_2,
|
APDS9960_REG_GCONF_2,
|
||||||
APDS9960_REG_CONFIG_2_GGAIN_MASK,
|
APDS9960_REG_GCONF_2_GGAIN_MASK,
|
||||||
idx << APDS9960_REG_CONFIG_2_GGAIN_MASK_SHIFT);
|
idx << APDS9960_REG_GCONF_2_GGAIN_MASK_SHIFT);
|
||||||
if (!ret)
|
if (!ret)
|
||||||
data->pxs_gain = idx;
|
data->pxs_gain = idx;
|
||||||
mutex_unlock(&data->lock);
|
mutex_unlock(&data->lock);
|
||||||
|
|
Loading…
Reference in a new issue