* [PATCH v3] iio: sx9310: Fix semtech,avg-pos-strength setting when > 16
@ 2020-12-02 20:02 Stephen Boyd
2020-12-08 22:24 ` Doug Anderson
2021-01-11 19:06 ` Stephen Boyd
0 siblings, 2 replies; 4+ messages in thread
From: Stephen Boyd @ 2020-12-02 20:02 UTC (permalink / raw)
To: Jonathan Cameron
Cc: linux-kernel, linux-iio, Daniel Campello, Lars-Peter Clausen,
Peter Meerwald-Stadler, Douglas Anderson, Gwendal Grignou,
Evan Green
This DT property can be 0, 16, and then 64, but not 32. The math here
doesn't recognize this slight bump in the power of 2 numbers and
translates a DT property of 64 into the register value '3' when it
really should be '2'. Fix it by subtracting one more if the number being
translated is larger than 31. Also use clamp() because we're here.
Cc: Daniel Campello <campello@chromium.org>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Cc: Peter Meerwald-Stadler <pmeerw@pmeerw.net>
Cc: Douglas Anderson <dianders@chromium.org>
Cc: Gwendal Grignou <gwendal@chromium.org>
Cc: Evan Green <evgreen@chromium.org>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
---
Changes from v2 (https://lore.kernel.org/r/20201120182944.543428-1-swboyd@chromium.org):
* Use clamp()
* Add comment to clarify
Changes from v1 (https://lore.kernel.org/r/20201120073842.3232458-1-swboyd@chromium.org):
* Changed ternary to consider 17 to 31 as the same as 16
drivers/iio/proximity/sx9310.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/iio/proximity/sx9310.c b/drivers/iio/proximity/sx9310.c
index a2f820997afc..0e6863e4d384 100644
--- a/drivers/iio/proximity/sx9310.c
+++ b/drivers/iio/proximity/sx9310.c
@@ -1305,7 +1305,8 @@ sx9310_get_default_reg(struct sx9310_data *data, int i,
if (ret)
break;
- pos = min(max(ilog2(pos), 3), 10) - 3;
+ /* Powers of 2, except for a gap between 16 and 64 */
+ pos = clamp(ilog2(pos), 3, 11) - (pos >= 32 ? 4 : 3);
reg_def->def &= ~SX9310_REG_PROX_CTRL7_AVGPOSFILT_MASK;
reg_def->def |= FIELD_PREP(SX9310_REG_PROX_CTRL7_AVGPOSFILT_MASK,
pos);
base-commit: 5b19ca2c78a0838976064c0347e46a2c859b541d
--
https://chromeos.dev
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v3] iio: sx9310: Fix semtech,avg-pos-strength setting when > 16
2020-12-02 20:02 [PATCH v3] iio: sx9310: Fix semtech,avg-pos-strength setting when > 16 Stephen Boyd
@ 2020-12-08 22:24 ` Doug Anderson
2021-01-11 19:06 ` Stephen Boyd
1 sibling, 0 replies; 4+ messages in thread
From: Doug Anderson @ 2020-12-08 22:24 UTC (permalink / raw)
To: Stephen Boyd
Cc: Jonathan Cameron, LKML, linux-iio, Daniel Campello,
Lars-Peter Clausen, Peter Meerwald-Stadler, Gwendal Grignou,
Evan Green
Hi,
On Wed, Dec 2, 2020 at 12:02 PM Stephen Boyd <swboyd@chromium.org> wrote:
>
> This DT property can be 0, 16, and then 64, but not 32. The math here
> doesn't recognize this slight bump in the power of 2 numbers and
> translates a DT property of 64 into the register value '3' when it
> really should be '2'. Fix it by subtracting one more if the number being
> translated is larger than 31. Also use clamp() because we're here.
>
> Cc: Daniel Campello <campello@chromium.org>
> Cc: Lars-Peter Clausen <lars@metafoo.de>
> Cc: Peter Meerwald-Stadler <pmeerw@pmeerw.net>
> Cc: Douglas Anderson <dianders@chromium.org>
> Cc: Gwendal Grignou <gwendal@chromium.org>
> Cc: Evan Green <evgreen@chromium.org>
> Signed-off-by: Stephen Boyd <swboyd@chromium.org>
> ---
>
> Changes from v2 (https://lore.kernel.org/r/20201120182944.543428-1-swboyd@chromium.org):
> * Use clamp()
> * Add comment to clarify
>
> Changes from v1 (https://lore.kernel.org/r/20201120073842.3232458-1-swboyd@chromium.org):
> * Changed ternary to consider 17 to 31 as the same as 16
>
> drivers/iio/proximity/sx9310.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
Reviewed-by: Douglas Anderson <dianders@chromium.org>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v3] iio: sx9310: Fix semtech,avg-pos-strength setting when > 16
2020-12-02 20:02 [PATCH v3] iio: sx9310: Fix semtech,avg-pos-strength setting when > 16 Stephen Boyd
2020-12-08 22:24 ` Doug Anderson
@ 2021-01-11 19:06 ` Stephen Boyd
2021-01-14 22:15 ` Jonathan Cameron
1 sibling, 1 reply; 4+ messages in thread
From: Stephen Boyd @ 2021-01-11 19:06 UTC (permalink / raw)
To: Jonathan Cameron
Cc: linux-kernel, linux-iio, Daniel Campello, Lars-Peter Clausen,
Peter Meerwald-Stadler, Douglas Anderson, Gwendal Grignou,
Evan Green
Quoting Stephen Boyd (2020-12-02 12:02:52)
> This DT property can be 0, 16, and then 64, but not 32. The math here
> doesn't recognize this slight bump in the power of 2 numbers and
> translates a DT property of 64 into the register value '3' when it
> really should be '2'. Fix it by subtracting one more if the number being
> translated is larger than 31. Also use clamp() because we're here.
>
> Cc: Daniel Campello <campello@chromium.org>
> Cc: Lars-Peter Clausen <lars@metafoo.de>
> Cc: Peter Meerwald-Stadler <pmeerw@pmeerw.net>
> Cc: Douglas Anderson <dianders@chromium.org>
> Cc: Gwendal Grignou <gwendal@chromium.org>
> Cc: Evan Green <evgreen@chromium.org>
> Signed-off-by: Stephen Boyd <swboyd@chromium.org>
> ---
Hi Jonathan,
Happy new year! Can this be picked up? Or should I resend?
>
> Changes from v2 (https://lore.kernel.org/r/20201120182944.543428-1-swboyd@chromium.org):
> * Use clamp()
> * Add comment to clarify
>
> Changes from v1 (https://lore.kernel.org/r/20201120073842.3232458-1-swboyd@chromium.org):
> * Changed ternary to consider 17 to 31 as the same as 16
>
> drivers/iio/proximity/sx9310.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/iio/proximity/sx9310.c b/drivers/iio/proximity/sx9310.c
> index a2f820997afc..0e6863e4d384 100644
> --- a/drivers/iio/proximity/sx9310.c
> +++ b/drivers/iio/proximity/sx9310.c
> @@ -1305,7 +1305,8 @@ sx9310_get_default_reg(struct sx9310_data *data, int i,
> if (ret)
> break;
>
> - pos = min(max(ilog2(pos), 3), 10) - 3;
> + /* Powers of 2, except for a gap between 16 and 64 */
> + pos = clamp(ilog2(pos), 3, 11) - (pos >= 32 ? 4 : 3);
> reg_def->def &= ~SX9310_REG_PROX_CTRL7_AVGPOSFILT_MASK;
> reg_def->def |= FIELD_PREP(SX9310_REG_PROX_CTRL7_AVGPOSFILT_MASK,
> pos);
>
> base-commit: 5b19ca2c78a0838976064c0347e46a2c859b541d
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v3] iio: sx9310: Fix semtech,avg-pos-strength setting when > 16
2021-01-11 19:06 ` Stephen Boyd
@ 2021-01-14 22:15 ` Jonathan Cameron
0 siblings, 0 replies; 4+ messages in thread
From: Jonathan Cameron @ 2021-01-14 22:15 UTC (permalink / raw)
To: Stephen Boyd
Cc: linux-kernel, linux-iio, Daniel Campello, Lars-Peter Clausen,
Peter Meerwald-Stadler, Douglas Anderson, Gwendal Grignou,
Evan Green
On Mon, 11 Jan 2021 11:06:41 -0800
Stephen Boyd <swboyd@chromium.org> wrote:
> Quoting Stephen Boyd (2020-12-02 12:02:52)
> > This DT property can be 0, 16, and then 64, but not 32. The math here
> > doesn't recognize this slight bump in the power of 2 numbers and
> > translates a DT property of 64 into the register value '3' when it
> > really should be '2'. Fix it by subtracting one more if the number being
> > translated is larger than 31. Also use clamp() because we're here.
> >
> > Cc: Daniel Campello <campello@chromium.org>
> > Cc: Lars-Peter Clausen <lars@metafoo.de>
> > Cc: Peter Meerwald-Stadler <pmeerw@pmeerw.net>
> > Cc: Douglas Anderson <dianders@chromium.org>
> > Cc: Gwendal Grignou <gwendal@chromium.org>
> > Cc: Evan Green <evgreen@chromium.org>
> > Signed-off-by: Stephen Boyd <swboyd@chromium.org>
> > ---
>
> Hi Jonathan,
>
> Happy new year! Can this be picked up? Or should I resend?
Happy new year to you as well!
Oops. Sorry - I lost this one somehow.
Anyhow, now applied and it's the pull request I just sent out.
Jonathan
>
> >
> > Changes from v2 (https://lore.kernel.org/r/20201120182944.543428-1-swboyd@chromium.org):
> > * Use clamp()
> > * Add comment to clarify
> >
> > Changes from v1 (https://lore.kernel.org/r/20201120073842.3232458-1-swboyd@chromium.org):
> > * Changed ternary to consider 17 to 31 as the same as 16
> >
> > drivers/iio/proximity/sx9310.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/iio/proximity/sx9310.c b/drivers/iio/proximity/sx9310.c
> > index a2f820997afc..0e6863e4d384 100644
> > --- a/drivers/iio/proximity/sx9310.c
> > +++ b/drivers/iio/proximity/sx9310.c
> > @@ -1305,7 +1305,8 @@ sx9310_get_default_reg(struct sx9310_data *data, int i,
> > if (ret)
> > break;
> >
> > - pos = min(max(ilog2(pos), 3), 10) - 3;
> > + /* Powers of 2, except for a gap between 16 and 64 */
> > + pos = clamp(ilog2(pos), 3, 11) - (pos >= 32 ? 4 : 3);
> > reg_def->def &= ~SX9310_REG_PROX_CTRL7_AVGPOSFILT_MASK;
> > reg_def->def |= FIELD_PREP(SX9310_REG_PROX_CTRL7_AVGPOSFILT_MASK,
> > pos);
> >
> > base-commit: 5b19ca2c78a0838976064c0347e46a2c859b541d
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-01-14 22:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-02 20:02 [PATCH v3] iio: sx9310: Fix semtech,avg-pos-strength setting when > 16 Stephen Boyd
2020-12-08 22:24 ` Doug Anderson
2021-01-11 19:06 ` Stephen Boyd
2021-01-14 22:15 ` Jonathan Cameron
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).