kernel: bump 5.15 to 5.15.150

[openwrt/staging/blocktrron.git] / target / linux / bcm27xx / patches-5.15 / 950-0853-clk-Switch-from-__clk_determine_rate-to-clk_core_rou.patch

diff --git a/target/linux/bcm27xx/patches-5.15/950-0853-clk-Switch-from-__clk_determine_rate-to-clk_core_rou.patch b/target/linux/bcm27xx/patches-5.15/950-0853-clk-Switch-from-__clk_determine_rate-to-clk_core_rou.patch
index 2f5eb060191f8e374c42f0e6987b88dbc05e2dfd..b13df66d9a1f10a2813ebaa10d60b1e03bd1f339 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0853-clk-Switch-from-__clk_determine_rate-to-clk_core_rou.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0853-clk-Switch-from-__clk_determine_rate-to-clk_core_rou.patch
@@ -24,7 +24,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
 
 --- a/drivers/clk/clk.c
 +++ b/drivers/clk/clk.c
-@@ -542,6 +542,9 @@ static bool mux_is_better_rate(unsigned
+@@ -553,6 +553,9 @@ static bool mux_is_better_rate(unsigned
        return now <= rate && now > best;
  }
  
@@ -34,7 +34,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  int clk_mux_determine_rate_flags(struct clk_hw *hw,
                                 struct clk_rate_request *req,
                                 unsigned long flags)
-@@ -555,8 +558,12 @@ int clk_mux_determine_rate_flags(struct
+@@ -566,8 +569,12 @@ int clk_mux_determine_rate_flags(struct
        if (core->flags & CLK_SET_RATE_NO_REPARENT) {
                parent = core->parent;
                if (core->flags & CLK_SET_RATE_PARENT) {
@@ -49,7 +49,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
                        if (ret)
                                return ret;
  
-@@ -579,7 +586,7 @@ int clk_mux_determine_rate_flags(struct
+@@ -590,7 +597,7 @@ int clk_mux_determine_rate_flags(struct
  
                if (core->flags & CLK_SET_RATE_PARENT) {
                        parent_req = *req;