Skip to contentSkip to conversation

Revert "clk: imx: composite-8m: Add support to determine_rate"

PATCH Applied Adam Ford 3 participants 4 messages Apr 23, 2023 – May 3, 2023

Subsystems (3)
lore
Share & tools
lore

Adam Ford

author
#0 lore raw

PATCH 1/1 Revert "clk: imx: composite-8m: Add support to determine_rate"

This reverts commit 156e96ff2172518b6f83e97d8f11f677bc668e22.

This patch was found to cause some division issues on the i.MX8MP which causes the video clocks to not properly divide when division was greate than 8. This causes video failures on disp1_pix and disp2_pix clocks.

Until a better solution is found, we'll have to revert this.

drivers/clk/imx/clk-composite-8m.c +0 -7
index 6883a8199b6c..cbf0d7955a00 100644
@@ -119,17 +119,10 @@ static int imx8m_clk_composite_divider_set_rate(struct clk_hw *hw,
 	return ret;
 }
 
-static int imx8m_clk_divider_determine_rate(struct clk_hw *hw,
-				      struct clk_rate_request *req)
-{
-	return clk_divider_ops.determine_rate(hw, req);
-}
-
 static const struct clk_ops imx8m_clk_composite_divider_ops = {
 	.recalc_rate = imx8m_clk_composite_divider_recalc_rate,
 	.round_rate = imx8m_clk_composite_divider_round_rate,
 	.set_rate = imx8m_clk_composite_divider_set_rate,
-	.determine_rate = imx8m_clk_divider_determine_rate,
 };
 
 static u8 imx8m_clk_composite_mux_get_parent(struct clk_hw *hw)
Signature · 1 line
2.39.2
reviewer Acked-by on v1 1/1
#1 lore raw
Quoted 5 lines

Subject: [PATCH] Revert "clk: imx: composite-8m: Add support to determine_rate"

This reverts commit 156e96ff2172518b6f83e97d8f11f677bc668e22.

Quoted 7 lines

This patch was found to cause some division issues on the i.MX8MP which causes the video clocks to not properly divide when division was greate than
8. This causes video failures on disp1_pix and disp2_pix clocks.

Until a better solution is found, we'll have to revert this.

Indeed we already see issue in NXP local CI with the previous patch.

Quoted 27 lines
drivers/clk/imx/clk- renamed from drivers/clk/imx/clk-composite-8m.c +0 -0

composite-8m.c
index 6883a8199b6c..cbf0d7955a00 100644

drivers/clk/imx/clk-composite-8m.c +0 -7
@@ -119,17 +119,10 @@ static int
 imx8m_clk_composite_divider_set_rate(struct clk_hw *hw,
 	return ret;
 }
 
-static int imx8m_clk_divider_determine_rate(struct clk_hw *hw,
-				      struct clk_rate_request *req)
-{
-	return clk_divider_ops.determine_rate(hw, req);
-}
-
 static const struct clk_ops imx8m_clk_composite_divider_ops = {
 	.recalc_rate = imx8m_clk_composite_divider_recalc_rate,
 	.round_rate = imx8m_clk_composite_divider_round_rate,
 	.set_rate = imx8m_clk_composite_divider_set_rate,
-	.determine_rate = imx8m_clk_divider_determine_rate,
 };
 

static u8 imx8m_clk_composite_mux_get_parent(struct clk_hw *hw)
--
2.39.2

author
#2 lore raw
Quoted 4 lines · Peng Fan
Quoted 4 lines

Subject: [PATCH] Revert "clk: imx: composite-8m: Add support to determine_rate"

Quoted 8 lines
Quoted 8 lines

This reverts commit 156e96ff2172518b6f83e97d8f11f677bc668e22.

This patch was found to cause some division issues on the i.MX8MP which causes the video clocks to not properly divide when division was greate than
8. This causes video failures on disp1_pix and disp2_pix clocks.

Until a better solution is found, we'll have to revert this.

Abel / Stephen,

Is there a way we can get this applied and put in for RC1? When I originally did this, I only tested with Nano and some brief testing with Mini, but it wasn't until I tested with Plus that I found issues.

thanks

adam

Quoted 34 lines
Quoted 1 line

Indeed we already see issue in NXP local CI with the previous patch.

Quoted 27 lines
drivers/clk/imx/clk- renamed from drivers/clk/imx/clk-composite-8m.c +0 -0

composite-8m.c
index 6883a8199b6c..cbf0d7955a00 100644

drivers/clk/imx/clk-composite-8m.c +0 -7
@@ -119,17 +119,10 @@ static int
 imx8m_clk_composite_divider_set_rate(struct clk_hw *hw,
      return ret;
 }
 
-static int imx8m_clk_divider_determine_rate(struct clk_hw *hw,
-                                   struct clk_rate_request *req)
-{
-     return clk_divider_ops.determine_rate(hw, req);
-}
-
 static const struct clk_ops imx8m_clk_composite_divider_ops = {
      .recalc_rate = imx8m_clk_composite_divider_recalc_rate,
      .round_rate = imx8m_clk_composite_divider_round_rate,
      .set_rate = imx8m_clk_composite_divider_set_rate,
-     .determine_rate = imx8m_clk_divider_determine_rate,
 };
 

static u8 imx8m_clk_composite_mux_get_parent(struct clk_hw *hw)
--
2.39.2

maintainer Applied
#3 lore raw
In reply to Adam Ford

Quoting Adam Ford (2023-04-23 05:38:27)

Quoted 13 lines

This reverts commit 156e96ff2172518b6f83e97d8f11f677bc668e22.

This patch was found to cause some division issues on the i.MX8MP which causes the video clocks to not properly divide when division was greate than 8. This causes video failures on disp1_pix and disp2_pix clocks.

Until a better solution is found, we'll have to revert this.

drivers/clk/imx/clk-composite-8m.c +0 -0
index 6883a8199b6c..cbf0d7955a00 100644

drivers/clk/imx/clk-composite-8m.c

Quoted 1 line
drivers/clk/imx/clk-composite-8m.c +0 -1
--- a/drivers/clk/imx/clk-composite-8m.c

Applied to clk-next