2022-11-22 14:06:04

by Andy Shevchenko

Subject: [PATCH v2 1/3] clk: fractional-divider: Split out clk_fd_get_div() helper

Split out clk_fd_get_div() helper for the future use elsewhere.

Signed-off-by: Andy Shevchenko <[email protected]>
---
v2: no changes
drivers/clk/clk-fractional-divider.c | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/drivers/clk/clk-fractional-divider.c b/drivers/clk/clk-fractional-divider.c
index 8efa5142ff8c..5c6f1d0f8fb4 100644
--- a/drivers/clk/clk-fractional-divider.c
+++ b/drivers/clk/clk-fractional-divider.c
@@ -40,6 +40,7 @@

#include <linux/clk-provider.h>
#include <linux/io.h>
+#include <linux/math.h>
#include <linux/module.h>
#include <linux/device.h>
#include <linux/slab.h>
@@ -63,14 +64,12 @@ static inline void clk_fd_writel(struct clk_fractional_divider *fd, u32 val)
writel(val, fd->reg);
}

-static unsigned long clk_fd_recalc_rate(struct clk_hw *hw,
- unsigned long parent_rate)
+static void clk_fd_get_div(struct clk_hw *hw, struct u32_fract *fract)
{
struct clk_fractional_divider *fd = to_clk_fd(hw);
unsigned long flags = 0;
unsigned long m, n;
u32 val;
- u64 ret;

if (fd->lock)
spin_lock_irqsave(fd->lock, flags);
@@ -92,11 +91,22 @@ static unsigned long clk_fd_recalc_rate(struct clk_hw *hw,
n++;
}

- if (!n || !m)
+ fract->numerator = m;
+ fract->denominator = n;
+}
+
+static unsigned long clk_fd_recalc_rate(struct clk_hw *hw, unsigned long parent_rate)
+{
+ struct u32_fract fract;
+ u64 ret;
+
+ clk_fd_get_div(hw, &fract);
+
+ if (!fract.numerator || !fract.denominator)
return parent_rate;

- ret = (u64)parent_rate * m;
- do_div(ret, n);
+ ret = (u64)parent_rate * fract.numerator;
+ do_div(ret, fract.denominator);

return ret;
}
--
2.35.1

2022-11-22 14:06:21

by Andy Shevchenko

Subject: [PATCH v2 3/3] clk: fractional-divider: Regroup inclusions

For the better maintenance regroup inclusions as follows:
- split CCF related headers in its own group
- order groups from generic to particular
- sort each group alphabetically

Signed-off-by: Andy Shevchenko <[email protected]>
---
v2: dropped duplicate of linux/clk-provider.h
drivers/clk/clk-fractional-divider.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/clk/clk-fractional-divider.c b/drivers/clk/clk-fractional-divider.c
index b6b52b79d671..6affe3565025 100644
--- a/drivers/clk/clk-fractional-divider.c
+++ b/drivers/clk/clk-fractional-divider.c
@@ -38,14 +38,15 @@
* saturated values.
*/

-#include <linux/clk-provider.h>
#include <linux/debugfs.h>
+#include <linux/device.h>
#include <linux/io.h>
#include <linux/math.h>
#include <linux/module.h>
-#include <linux/device.h>
-#include <linux/slab.h>
#include <linux/rational.h>
+#include <linux/slab.h>
+
+#include <linux/clk-provider.h>

#include "clk-fractional-divider.h"

--
2.35.1

2022-11-23 02:46:40

by Stephen Boyd

Subject: Re: [PATCH v2 1/3] clk: fractional-divider: Split out clk_fd_get_div() helper

Quoting Andy Shevchenko (2022-11-22 05:07:30)
> Split out clk_fd_get_div() helper for the future use elsewhere.
>
> Signed-off-by: Andy Shevchenko <[email protected]>
> ---

Applied to clk-next

2022-11-23 02:52:40

by Stephen Boyd

Subject: Re: [PATCH v2 3/3] clk: fractional-divider: Regroup inclusions

Quoting Andy Shevchenko (2022-11-22 05:07:32)
> For the better maintenance regroup inclusions as follows:
> - split CCF related headers in its own group
> - order groups from generic to particular
> - sort each group alphabetically
>
> Signed-off-by: Andy Shevchenko <[email protected]>
> ---

Applied to clk-next