Commit 2bc3ada0 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'v6.15-rockchip-clkfixes1' of... 

Merge tag 'v6.15-rockchip-clkfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into clk-fixes

Pull a Rockchip clk driver fix from Heiko Stuebner:

Actually define the gate-clk for the otg-phy on rk3576 to make the nvmem-
support work, that was merged for 6.15.

* tag 'v6.15-rockchip-clkfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  clk: rockchip: rk3576: define clk_otp_phy_g
parents 0af2f6be d934a93b

drivers/clk/rockchip/clk-rk3576.c

+2 −0
Original line number Diff line number Diff line
@@ -541,6 +541,8 @@ static struct rockchip_clk_branch rk3576_clk_branches[] __initdata = { 
			RK3576_CLKGATE_CON(5), 14, GFLAGS),

	GATE(CLK_OTPC_AUTO_RD_G, "clk_otpc_auto_rd_g", "xin24m", 0,

			RK3576_CLKGATE_CON(5), 15, GFLAGS),

	GATE(CLK_OTP_PHY_G, "clk_otp_phy_g", "xin24m", 0,

			RK3576_CLKGATE_CON(6), 0, GFLAGS),

	COMPOSITE(CLK_MIPI_CAMERAOUT_M0, "clk_mipi_cameraout_m0", mux_24m_spll_gpll_cpll_p, 0,

			RK3576_CLKSEL_CON(38), 8, 2, MFLAGS, 0, 8, DFLAGS,

			RK3576_CLKGATE_CON(6), 3, GFLAGS),