Unverified Commit 383c4ff4 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'v6.18-rockchip-clk1' of... 

Merge tag 'v6.18-rockchip-clk1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into clk-rockchip

Pull Rockchip clk driver updates from Heiko Stuebner:

Export the dsi-24MHz clock on the RK3368, which seems to get some
attention to enable DSI support there.

* tag 'v6.18-rockchip-clk1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  clk: rockchip: rk3368: use clock ids for SCLK_MIPIDSI_24M
  dt-bindings: clock: rk3368: Add SCLK_MIPIDSI_24M
parents 8f5ae30d 77111b2c

drivers/clk/rockchip/clk-rk3368.c

+1 −1
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = { 
	GATE(ACLK_PERI, "aclk_peri", "aclk_peri_src", CLK_IGNORE_UNUSED,

			RK3368_CLKGATE_CON(3), 1, GFLAGS),



	GATE(0, "sclk_mipidsi_24m", "xin24m", 0, RK3368_CLKGATE_CON(4), 14, GFLAGS),

	GATE(SCLK_MIPIDSI_24M, "sclk_mipidsi_24m", "xin24m", 0, RK3368_CLKGATE_CON(4), 14, GFLAGS),



	/*

	 * Clock-Architecture Diagram 4

include/dt-bindings/clock/rk3368-cru.h

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ 
#define SCLK_SFC		126

#define SCLK_MAC		127

#define SCLK_MACREF_OUT		128

#define SCLK_MIPIDSI_24M	129

#define SCLK_TIMER10		133

#define SCLK_TIMER11		134

#define SCLK_TIMER12		135