Skip to content

Commit 48f8fb4

Browse files
committed
clk: ti: dra7-atl: convert from round_rate() to determine_rate()
The round_rate() clk ops is deprecated, so migrate this driver from round_rate() to determine_rate() using the Coccinelle semantic patch on the cover letter of this series. Tested-by: Anddreas Kemnade <andreas@kemnade.info> # OMAP3 GTA04, OMAP4 Panda Reviewed-by: Kevin Hilman <khilman@baylibre.com> Tested-by: Kevin Hilman <khilman@baylibre.com> Signed-off-by: Brian Masney <bmasney@redhat.com>
1 parent 7760b3e commit 48f8fb4

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

drivers/clk/ti/clk-dra7-atl.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,16 +120,18 @@ static unsigned long atl_clk_recalc_rate(struct clk_hw *hw,
120120
return parent_rate / cdesc->divider;
121121
}
122122

123-
static long atl_clk_round_rate(struct clk_hw *hw, unsigned long rate,
124-
unsigned long *parent_rate)
123+
static int atl_clk_determine_rate(struct clk_hw *hw,
124+
struct clk_rate_request *req)
125125
{
126126
unsigned divider;
127127

128-
divider = (*parent_rate + rate / 2) / rate;
128+
divider = (req->best_parent_rate + req->rate / 2) / req->rate;
129129
if (divider > DRA7_ATL_DIVIDER_MASK + 1)
130130
divider = DRA7_ATL_DIVIDER_MASK + 1;
131131

132-
return *parent_rate / divider;
132+
req->rate = req->best_parent_rate / divider;
133+
134+
return 0;
133135
}
134136

135137
static int atl_clk_set_rate(struct clk_hw *hw, unsigned long rate,
@@ -156,7 +158,7 @@ static const struct clk_ops atl_clk_ops = {
156158
.disable = atl_clk_disable,
157159
.is_enabled = atl_clk_is_enabled,
158160
.recalc_rate = atl_clk_recalc_rate,
159-
.round_rate = atl_clk_round_rate,
161+
.determine_rate = atl_clk_determine_rate,
160162
.set_rate = atl_clk_set_rate,
161163
};
162164

0 commit comments

Comments
 (0)