--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
-@@ -545,6 +545,26 @@ static bool mux_is_better_rate(unsigned
+@@ -556,6 +556,26 @@ static bool mux_is_better_rate(unsigned
static int clk_core_round_rate_nolock(struct clk_core *core,
struct clk_rate_request *req);
int clk_mux_determine_rate_flags(struct clk_hw *hw,
struct clk_rate_request *req,
unsigned long flags)
-@@ -2568,25 +2588,11 @@ void clk_hw_reparent(struct clk_hw *hw,
+@@ -2579,25 +2599,11 @@ void clk_hw_reparent(struct clk_hw *hw,
*/
bool clk_has_parent(struct clk *clk, struct clk *parent)
{