Skip to content

Commit 383c4ff

Browse files
committed
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
2 parents 8f5ae30 + 77111b2 commit 383c4ff

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

drivers/clk/rockchip/clk-rk3368.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = {
526526
GATE(ACLK_PERI, "aclk_peri", "aclk_peri_src", CLK_IGNORE_UNUSED,
527527
RK3368_CLKGATE_CON(3), 1, GFLAGS),
528528

529-
GATE(0, "sclk_mipidsi_24m", "xin24m", 0, RK3368_CLKGATE_CON(4), 14, GFLAGS),
529+
GATE(SCLK_MIPIDSI_24M, "sclk_mipidsi_24m", "xin24m", 0, RK3368_CLKGATE_CON(4), 14, GFLAGS),
530530

531531
/*
532532
* Clock-Architecture Diagram 4

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
#define SCLK_SFC 126
7373
#define SCLK_MAC 127
7474
#define SCLK_MACREF_OUT 128
75+
#define SCLK_MIPIDSI_24M 129
7576
#define SCLK_TIMER10 133
7677
#define SCLK_TIMER11 134
7778
#define SCLK_TIMER12 135

0 commit comments

Comments
 (0)