Commit 5c2b6d0f authored by Brian Masney's avatar Brian Masney
Browse files

clk: mediatek: pll: 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.

Signed-off-by: default avatarBrian Masney <bmasney@redhat.com>
parent 23603ba6

drivers/clk/mediatek/clk-pll.c

+8 −5
Original line number Diff line number Diff line
@@ -200,16 +200,19 @@ unsigned long mtk_pll_recalc_rate(struct clk_hw *hw, unsigned long parent_rate) 
	return __mtk_pll_recalc_rate(pll, parent_rate, pcw, postdiv);

}



long mtk_pll_round_rate(struct clk_hw *hw, unsigned long rate,

			unsigned long *prate)

int mtk_pll_determine_rate(struct clk_hw *hw, struct clk_rate_request *req)

{

	struct mtk_clk_pll *pll = to_mtk_clk_pll(hw);

	u32 pcw = 0;

	int postdiv;



	mtk_pll_calc_values(pll, &pcw, &postdiv, rate, *prate);

	mtk_pll_calc_values(pll, &pcw, &postdiv, req->rate,

			    req->best_parent_rate);



	return __mtk_pll_recalc_rate(pll, *prate, pcw, postdiv);

	req->rate = __mtk_pll_recalc_rate(pll, req->best_parent_rate, pcw,

					  postdiv);



	return 0;

}



int mtk_pll_prepare(struct clk_hw *hw)
@@ -279,7 +282,7 @@ const struct clk_ops mtk_pll_ops = { 
	.prepare	= mtk_pll_prepare,

	.unprepare	= mtk_pll_unprepare,

	.recalc_rate	= mtk_pll_recalc_rate,

	.round_rate	= mtk_pll_round_rate,

	.determine_rate = mtk_pll_determine_rate,

	.set_rate	= mtk_pll_set_rate,

};

drivers/clk/mediatek/clk-pll.h

+1 −2
Original line number Diff line number Diff line
@@ -96,8 +96,7 @@ void mtk_pll_calc_values(struct mtk_clk_pll *pll, u32 *pcw, u32 *postdiv, 
			 u32 freq, u32 fin);

int mtk_pll_set_rate(struct clk_hw *hw, unsigned long rate,

		     unsigned long parent_rate);

long mtk_pll_round_rate(struct clk_hw *hw, unsigned long rate,

			unsigned long *prate);

int mtk_pll_determine_rate(struct clk_hw *hw, struct clk_rate_request *req);



struct clk_hw *mtk_clk_register_pll_ops(struct mtk_clk_pll *pll,

					const struct mtk_pll_data *data,

drivers/clk/mediatek/clk-pllfh.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static const struct clk_ops mtk_pllfh_ops = { 
	.prepare	= mtk_pll_prepare,

	.unprepare	= mtk_pll_unprepare,

	.recalc_rate	= mtk_pll_recalc_rate,

	.round_rate	= mtk_pll_round_rate,

	.determine_rate = mtk_pll_determine_rate,

	.set_rate	= mtk_fhctl_set_rate,

};