2019-02-03 10:50:37

by Jerome Brunet

Subject: [PATCH] clk: meson: fix pll settings calculation with arm32

fix undefined reference to `__aeabi_uldivmod' when dividing
u64 on arm32.

Fixes: 496c0462b46f ("clk: meson: pll: update driver for the g12a")
Signed-off-by: Jerome Brunet <[email protected]>
---

Neil,

Feel free to squash this with the offending change. If you prefer,
I can submit a v7.

Cheers
Jerome

drivers/clk/meson/clk-pll.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clk/meson/clk-pll.c b/drivers/clk/meson/clk-pll.c
index 7946d21a4ff4..41e16dd7272a 100644
--- a/drivers/clk/meson/clk-pll.c
+++ b/drivers/clk/meson/clk-pll.c
@@ -151,7 +151,7 @@ static unsigned int meson_clk_get_pll_range_m(unsigned long rate,
if (__pll_round_closest_mult(pll))
return DIV_ROUND_CLOSEST_ULL(val, parent_rate);

- return val / parent_rate;
+ return div_u64(val, parent_rate);
}

static int meson_clk_get_pll_range_index(unsigned long rate,
--
2.20.1

2019-02-04 08:54:46

by Neil Armstrong

Subject: Re: [PATCH] clk: meson: fix pll settings calculation with arm32

On 03/02/2019 11:47, Jerome Brunet wrote:
> fix undefined reference to `__aeabi_uldivmod' when dividing
> u64 on arm32.
>
> Fixes: 496c0462b46f ("clk: meson: pll: update driver for the g12a")
> Signed-off-by: Jerome Brunet <[email protected]>
> ---
>
> Neil,
>
> Feel free to squash this with the offending change. If you prefer,
> I can submit a v7.
>
> Cheers
> Jerome
>
> drivers/clk/meson/clk-pll.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/clk/meson/clk-pll.c b/drivers/clk/meson/clk-pll.c
> index 7946d21a4ff4..41e16dd7272a 100644
> --- a/drivers/clk/meson/clk-pll.c
> +++ b/drivers/clk/meson/clk-pll.c
> @@ -151,7 +151,7 @@ static unsigned int meson_clk_get_pll_range_m(unsigned long rate,
> if (__pll_round_closest_mult(pll))
> return DIV_ROUND_CLOSEST_ULL(val, parent_rate);
>
> - return val / parent_rate;
> + return div_u64(val, parent_rate);
> }
>
> static int meson_clk_get_pll_range_index(unsigned long rate,
>

Thanks for the fix,

I squashed it on "clk: meson: pll: update driver for the g12a"

Neil