| Message ID | 20220122213444.745152-1-gwendal@chromium.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2] iio: sx9360: fix iio event generation | expand |
On Sat, 22 Jan 2022 13:34:44 -0800 Gwendal Grignou <gwendal@chromium.org> wrote: > From: Jongpil Jung <jongpil19.jung@samsung.com> > > To convert SX9360 status register ["REG_STAT"], into a channel > index, we need to right shift by |stat_offset|, not left shift. > Also the PROXSTAT bit (3) is for channel 1 (PHM, Phase Measured), not (PHR, > Phase Reference, channel 0), so the offset is 2 instead of 3. > > Fixes: f75095753 ("iio:proximity:sx9360: Add sx9360 support") Should be 12 chars of the hash. Also, tree rebased at rc1 so it's wrong anyway :) Fixed it up and applied to the togreg branch of iio.git and pushed out as testing for 0-day to see if it can find anything else. Thanks, Jonathan > Signed-off-by: Jongpil Jung <jongpil19.jung@samsung.com> > Signed-off-by: Gwendal Grignou <gwendal@chromium.org> > --- > Changes since v1: > - Change title to highlight the patch is a fix. > - Put "Fixes:" tag in the commit message footer > > drivers/iio/proximity/sx9360.c | 2 +- > drivers/iio/proximity/sx_common.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/iio/proximity/sx9360.c b/drivers/iio/proximity/sx9360.c > index 6fd6561bb6f5b8..3ebb30c8a4f61d 100644 > --- a/drivers/iio/proximity/sx9360.c > +++ b/drivers/iio/proximity/sx9360.c > @@ -775,7 +775,7 @@ static const struct sx_common_chip_info sx9360_chip_info = { > .reg_reset = SX9360_REG_RESET, > > .mask_enable_chan = SX9360_REG_GNRL_CTRL0_PHEN_MASK, > - .stat_offset = 3, > + .stat_offset = 2, > .num_channels = SX9360_NUM_CHANNELS, > .num_default_regs = ARRAY_SIZE(sx9360_default_regs), > > diff --git a/drivers/iio/proximity/sx_common.c b/drivers/iio/proximity/sx_common.c > index ac8fd5920481cb..a7c07316a0a91e 100644 > --- a/drivers/iio/proximity/sx_common.c > +++ b/drivers/iio/proximity/sx_common.c > @@ -87,7 +87,7 @@ static void sx_common_push_events(struct iio_dev *indio_dev) > return; > } > > - val <<= data->chip_info->stat_offset; > + val >>= data->chip_info->stat_offset; > > /* > * Only iterate over channels with changes on proximity status that have
diff --git a/drivers/iio/proximity/sx9360.c b/drivers/iio/proximity/sx9360.c index 6fd6561bb6f5b8..3ebb30c8a4f61d 100644 --- a/drivers/iio/proximity/sx9360.c +++ b/drivers/iio/proximity/sx9360.c @@ -775,7 +775,7 @@ static const struct sx_common_chip_info sx9360_chip_info = { .reg_reset = SX9360_REG_RESET, .mask_enable_chan = SX9360_REG_GNRL_CTRL0_PHEN_MASK, - .stat_offset = 3, + .stat_offset = 2, .num_channels = SX9360_NUM_CHANNELS, .num_default_regs = ARRAY_SIZE(sx9360_default_regs), diff --git a/drivers/iio/proximity/sx_common.c b/drivers/iio/proximity/sx_common.c index ac8fd5920481cb..a7c07316a0a91e 100644 --- a/drivers/iio/proximity/sx_common.c +++ b/drivers/iio/proximity/sx_common.c @@ -87,7 +87,7 @@ static void sx_common_push_events(struct iio_dev *indio_dev) return; } - val <<= data->chip_info->stat_offset; + val >>= data->chip_info->stat_offset; /* * Only iterate over channels with changes on proximity status that have