Skip to content

Commit 699470f

Browse files
xdarklightbebarino
authored andcommitted
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 <m.szyprowski@samsung.com> Cc: Nicolas Saenz Julienne <nsaenz@kernel.org> Cc: Florian Fainelli <f.fainelli@gmail.com> Cc: Ray Jui <rjui@broadcom.com> Cc: Scott Branden <sbranden@broadcom.com> Cc: bcm-kernel-feedback-list@broadcom.com Cc: linux-rpi-kernel@lists.infradead.org Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Link: https://lore.kernel.org/r/20210702225145.2643303-4-martin.blumenstingl@googlemail.com Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Stephen Boyd <sboyd@kernel.org>
1 parent 69a00fb commit 699470f

1 file changed

Lines changed: 4 additions & 5 deletions

File tree

drivers/clk/bcm/clk-bcm2835.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -805,11 +805,10 @@ static int bcm2835_pll_divider_is_on(struct clk_hw *hw)
805805
return !(cprman_read(cprman, data->a2w_reg) & A2W_PLL_CHANNEL_DISABLE);
806806
}
807807

808-
static long bcm2835_pll_divider_round_rate(struct clk_hw *hw,
809-
unsigned long rate,
810-
unsigned long *parent_rate)
808+
static int bcm2835_pll_divider_determine_rate(struct clk_hw *hw,
809+
struct clk_rate_request *req)
811810
{
812-
return clk_divider_ops.round_rate(hw, rate, parent_rate);
811+
return clk_divider_ops.determine_rate(hw, req);
813812
}
814813

815814
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 = {
901900
.unprepare = bcm2835_pll_divider_off,
902901
.recalc_rate = bcm2835_pll_divider_get_rate,
903902
.set_rate = bcm2835_pll_divider_set_rate,
904-
.round_rate = bcm2835_pll_divider_round_rate,
903+
.determine_rate = bcm2835_pll_divider_determine_rate,
905904
.debug_init = bcm2835_pll_divider_debug_init,
906905
};
907906

0 commit comments

Comments
 (0)