2018-06-19 15:49:30

by Jerome Brunet

Subject: [PATCH] clk: meson: audio-divider is one based

The audio divider is one based. This offset was mistakenly dropped from
recalc_rate() when migrating to clk_regmap.

Fixes: 88a4e1283681 ("clk: meson: migrate the audio divider clock to clk_regmap")
Signed-off-by: Jerome Brunet <[email protected]>
---
drivers/clk/meson/clk-audio-divider.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clk/meson/clk-audio-divider.c b/drivers/clk/meson/clk-audio-divider.c
index 58f546e04807..e4cf96ba704e 100644
--- a/drivers/clk/meson/clk-audio-divider.c
+++ b/drivers/clk/meson/clk-audio-divider.c
@@ -51,7 +51,7 @@ static unsigned long audio_divider_recalc_rate(struct clk_hw *hw,
struct meson_clk_audio_div_data *adiv = meson_clk_audio_div_data(clk);
unsigned long divider;

- divider = meson_parm_read(clk->map, &adiv->div);
+ divider = meson_parm_read(clk->map, &adiv->div) + 1;

return DIV_ROUND_UP_ULL((u64)parent_rate, divider);
}
--
2.14.3

2018-06-20 08:32:44

by Neil Armstrong

Subject: Re: [PATCH] clk: meson: audio-divider is one based

On 19/06/2018 17:47, Jerome Brunet wrote:
> The audio divider is one based. This offset was mistakenly dropped from
> recalc_rate() when migrating to clk_regmap.
>
> Fixes: 88a4e1283681 ("clk: meson: migrate the audio divider clock to clk_regmap")
> Signed-off-by: Jerome Brunet <[email protected]>
> ---
> drivers/clk/meson/clk-audio-divider.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/clk/meson/clk-audio-divider.c b/drivers/clk/meson/clk-audio-divider.c
> index 58f546e04807..e4cf96ba704e 100644
> --- a/drivers/clk/meson/clk-audio-divider.c
> +++ b/drivers/clk/meson/clk-audio-divider.c
> @@ -51,7 +51,7 @@ static unsigned long audio_divider_recalc_rate(struct clk_hw *hw,
> struct meson_clk_audio_div_data *adiv = meson_clk_audio_div_data(clk);
> unsigned long divider;
>
> - divider = meson_parm_read(clk->map, &adiv->div);
> + divider = meson_parm_read(clk->map, &adiv->div) + 1;
>
> return DIV_ROUND_UP_ULL((u64)parent_rate, divider);
> }
>
Acked-by: Neil Armstrong <[email protected]>

2018-06-22 10:42:26

by Jerome Brunet

Subject: Re: [PATCH] clk: meson: audio-divider is one based

On Wed, 2018-06-20 at 10:31 +0200, Neil Armstrong wrote:
> On 19/06/2018 17:47, Jerome Brunet wrote:
> > The audio divider is one based. This offset was mistakenly dropped from
> > recalc_rate() when migrating to clk_regmap.
> >
> > Fixes: 88a4e1283681 ("clk: meson: migrate the audio divider clock to clk_regmap")
> > Signed-off-by: Jerome Brunet <[email protected]>
> > ---
> > drivers/clk/meson/clk-audio-divider.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/clk/meson/clk-audio-divider.c b/drivers/clk/meson/clk-audio-divider.c
> > index 58f546e04807..e4cf96ba704e 100644
> > --- a/drivers/clk/meson/clk-audio-divider.c
> > +++ b/drivers/clk/meson/clk-audio-divider.c
> > @@ -51,7 +51,7 @@ static unsigned long audio_divider_recalc_rate(struct clk_hw *hw,
> > struct meson_clk_audio_div_data *adiv = meson_clk_audio_div_data(clk);
> > unsigned long divider;
> >
> > - divider = meson_parm_read(clk->map, &adiv->div);
> > + divider = meson_parm_read(clk->map, &adiv->div) + 1;
> >
> > return DIV_ROUND_UP_ULL((u64)parent_rate, divider);
> > }
> >
>
> Acked-by: Neil Armstrong <[email protected]>
>

Applied for fixes