2021-07-02 22:52:56

by Martin Blumenstingl

Subject: [PATCH v1 3/6] clk: bcm2835: Switch to clk_divider.determine_rate

.determine_rate is meant to replace .round_rate in CCF in the future.
Switch over to .determine_rate now that clk_divider_ops has gained
support for that.

Cc: Marek Szyprowski <[email protected]>
Cc: Nicolas Saenz Julienne <[email protected]>
Cc: Florian Fainelli <[email protected]>
Cc: Ray Jui <[email protected]>
Cc: Scott Branden <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Martin Blumenstingl <[email protected]>
---
drivers/clk/bcm/clk-bcm2835.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
index 1ac803e14fa3..a254512965eb 100644
--- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -805,11 +805,10 @@ static int bcm2835_pll_divider_is_on(struct clk_hw *hw)
return !(cprman_read(cprman, data->a2w_reg) & A2W_PLL_CHANNEL_DISABLE);
}

-static long bcm2835_pll_divider_round_rate(struct clk_hw *hw,
- unsigned long rate,
- unsigned long *parent_rate)
+static int bcm2835_pll_divider_determine_rate(struct clk_hw *hw,
+ struct clk_rate_request *req)
{
- return clk_divider_ops.round_rate(hw, rate, parent_rate);
+ return clk_divider_ops.determine_rate(hw, req);
}

static unsigned long bcm2835_pll_divider_get_rate(struct clk_hw *hw,
@@ -901,7 +900,7 @@ static const struct clk_ops bcm2835_pll_divider_clk_ops = {
.unprepare = bcm2835_pll_divider_off,
.recalc_rate = bcm2835_pll_divider_get_rate,
.set_rate = bcm2835_pll_divider_set_rate,
- .round_rate = bcm2835_pll_divider_round_rate,
+ .determine_rate = bcm2835_pll_divider_determine_rate,
.debug_init = bcm2835_pll_divider_debug_init,
};

--
2.32.0

2021-07-05 06:59:39

by Marek Szyprowski

Subject: Re: [PATCH v1 3/6] clk: bcm2835: Switch to clk_divider.determine_rate

On 03.07.2021 00:51, Martin Blumenstingl wrote:
> .determine_rate is meant to replace .round_rate in CCF in the future.
> Switch over to .determine_rate now that clk_divider_ops has gained
> support for that.
>
> Cc: Marek Szyprowski <[email protected]>
> Cc: Nicolas Saenz Julienne <[email protected]>
> Cc: Florian Fainelli <[email protected]>
> Cc: Ray Jui <[email protected]>
> Cc: Scott Branden <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Signed-off-by: Martin Blumenstingl <[email protected]>
Tested-by: Marek Szyprowski <[email protected]>
> ---
> drivers/clk/bcm/clk-bcm2835.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
> index 1ac803e14fa3..a254512965eb 100644
> --- a/drivers/clk/bcm/clk-bcm2835.c
> +++ b/drivers/clk/bcm/clk-bcm2835.c
> @@ -805,11 +805,10 @@ static int bcm2835_pll_divider_is_on(struct clk_hw *hw)
> return !(cprman_read(cprman, data->a2w_reg) & A2W_PLL_CHANNEL_DISABLE);
> }
>
> -static long bcm2835_pll_divider_round_rate(struct clk_hw *hw,
> - unsigned long rate,
> - unsigned long *parent_rate)
> +static int bcm2835_pll_divider_determine_rate(struct clk_hw *hw,
> + struct clk_rate_request *req)
> {
> - return clk_divider_ops.round_rate(hw, rate, parent_rate);
> + return clk_divider_ops.determine_rate(hw, req);
> }
>
> static unsigned long bcm2835_pll_divider_get_rate(struct clk_hw *hw,
> @@ -901,7 +900,7 @@ static const struct clk_ops bcm2835_pll_divider_clk_ops = {
> .unprepare = bcm2835_pll_divider_off,
> .recalc_rate = bcm2835_pll_divider_get_rate,
> .set_rate = bcm2835_pll_divider_set_rate,
> - .round_rate = bcm2835_pll_divider_round_rate,
> + .determine_rate = bcm2835_pll_divider_determine_rate,
> .debug_init = bcm2835_pll_divider_debug_init,
> };
>

Best regards
--
Marek Szyprowski, PhD
Samsung R&D Institute Poland

2021-08-06 02:49:54

by Stephen Boyd

Subject: Re: [PATCH v1 3/6] clk: bcm2835: Switch to clk_divider.determine_rate

Quoting Martin Blumenstingl (2021-07-02 15:51:42)
> .determine_rate is meant to replace .round_rate in CCF in the future.
> Switch over to .determine_rate now that clk_divider_ops has gained
> support for that.
>
> Cc: Marek Szyprowski <[email protected]>
> Cc: Nicolas Saenz Julienne <[email protected]>
> Cc: Florian Fainelli <[email protected]>
> Cc: Ray Jui <[email protected]>
> Cc: Scott Branden <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Signed-off-by: Martin Blumenstingl <[email protected]>
> ---

Applied to clk-next