Skip to content

Commit 0aa60ff

Browse files
asconcepcionjic23
authored andcommitted
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: aff268c ("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>
1 parent 38e9f21 commit 0aa60ff

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/iio/light/apds9960.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,6 @@
5454
#define APDS9960_REG_CONTROL_PGAIN_MASK_SHIFT 2
5555

5656
#define APDS9960_REG_CONFIG_2 0x90
57-
#define APDS9960_REG_CONFIG_2_GGAIN_MASK 0x60
58-
#define APDS9960_REG_CONFIG_2_GGAIN_MASK_SHIFT 5
59-
6057
#define APDS9960_REG_ID 0x92
6158

6259
#define APDS9960_REG_STATUS 0x93
@@ -77,6 +74,9 @@
7774
#define APDS9960_REG_GCONF_1_GFIFO_THRES_MASK_SHIFT 6
7875

7976
#define APDS9960_REG_GCONF_2 0xa3
77+
#define APDS9960_REG_GCONF_2_GGAIN_MASK 0x60
78+
#define APDS9960_REG_GCONF_2_GGAIN_MASK_SHIFT 5
79+
8080
#define APDS9960_REG_GOFFSET_U 0xa4
8181
#define APDS9960_REG_GOFFSET_D 0xa5
8282
#define APDS9960_REG_GPULSE 0xa6
@@ -396,9 +396,9 @@ static int apds9960_set_pxs_gain(struct apds9960_data *data, int val)
396396
}
397397

398398
ret = regmap_update_bits(data->regmap,
399-
APDS9960_REG_CONFIG_2,
400-
APDS9960_REG_CONFIG_2_GGAIN_MASK,
401-
idx << APDS9960_REG_CONFIG_2_GGAIN_MASK_SHIFT);
399+
APDS9960_REG_GCONF_2,
400+
APDS9960_REG_GCONF_2_GGAIN_MASK,
401+
idx << APDS9960_REG_GCONF_2_GGAIN_MASK_SHIFT);
402402
if (!ret)
403403
data->pxs_gain = idx;
404404
mutex_unlock(&data->lock);

0 commit comments

Comments
 (0)