From: Stephen Boyd <sboyd@kernel.org>
Date: Thu, 31 Jul 2025 16:10:06 +0000 (-0700)
Subject: Merge branch 'clk-fixes' into clk-next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64c21f253a3737c15ab745e9276b2352d86aed26;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'clk-fixes' into clk-next

Resolve conflicts with i.MX95 changes 88768d6f8c13 ("clk:
imx95-blk-ctl: Rename lvds and displaymix csr blk") in clk-imx
and aacc875a448d ("clk: imx: Fix an out-of-bounds access in
dispmix_csr_clk_dev_data") in clk-fixes.

* clk-fixes:
  clk: sunxi-ng: v3s: Fix TCON clock parents
  clk: sunxi-ng: v3s: Fix CSI1 MCLK clock name
  clk: sunxi-ng: v3s: Fix CSI SCLK clock name
  dt-bindings: clock: mediatek: Add #reset-cells property for MT8188
  clk: imx: Fix an out-of-bounds access in dispmix_csr_clk_dev_data
  clk: scmi: Handle case where child clocks are initialized before their parents
  clk: sunxi-ng: a523: Mark MBUS clock as critical
---

64c21f253a3737c15ab745e9276b2352d86aed26
diff --cc drivers/clk/sunxi-ng/ccu-sun8i-v3s.c
index 0c01aca4e19bf,52e4369664c58..05595ac51b76a
--- a/drivers/clk/sunxi-ng/ccu-sun8i-v3s.c
+++ b/drivers/clk/sunxi-ng/ccu-sun8i-v3s.c
@@@ -347,13 -347,12 +347,13 @@@ static SUNXI_CCU_GATE(dram_ohci_clk,	"d
  
  static const char * const de_parents[] = { "pll-video", "pll-periph0" };
  static SUNXI_CCU_M_WITH_MUX_GATE(de_clk, "de", de_parents,
 -				 0x104, 0, 4, 24, 2, BIT(31),
 -				 CLK_SET_RATE_PARENT);
 +				 0x104, 0, 4, 24, 3, BIT(31),
 +				 CLK_SET_RATE_NO_REPARENT);
  
- static const char * const tcon_parents[] = { "pll-video" };
+ static const char * const tcon_parents[] = { "pll-video", "pll-periph0" };
  static SUNXI_CCU_M_WITH_MUX_GATE(tcon_clk, "tcon", tcon_parents,
 -				 0x118, 0, 4, 24, 3, BIT(31), 0);
 +				 0x118, 0, 4, 24, 3, BIT(31),
 +				 CLK_SET_RATE_NO_REPARENT);
  
  static SUNXI_CCU_GATE(csi_misc_clk,	"csi-misc",	"osc24M",
  		      0x130, BIT(31), 0);