Skip to content

Commit 2dca2a6

Browse files
cristiccbebarino
authored andcommitted
clk: actions: Fix UART clock dividers on Owl S500 SoC
Use correct divider registers for the Actions Semi Owl S500 SoC's UART clocks. Fixes: ed6b479 ("clk: actions: Add clock driver for S500 SoC") Signed-off-by: Cristian Ciocaltea <[email protected]> Reviewed-by: Manivannan Sadhasivam <[email protected]> Link: https://lore.kernel.org/r/4714d05982b19ac5fec2ed74f54be42d8238e392.1623354574.git.cristian.ciocaltea@gmail.com Signed-off-by: Stephen Boyd <[email protected]>
1 parent 6efb943 commit 2dca2a6

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/clk/actions/owl-s500.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ static OWL_COMP_FIXED_FACTOR(i2c3_clk, "i2c3_clk", "ethernet_pll_clk",
305305
static OWL_COMP_DIV(uart0_clk, "uart0_clk", uart_clk_mux_p,
306306
OWL_MUX_HW(CMU_UART0CLK, 16, 1),
307307
OWL_GATE_HW(CMU_DEVCLKEN1, 6, 0),
308-
OWL_DIVIDER_HW(CMU_UART1CLK, 0, 8, CLK_DIVIDER_ROUND_CLOSEST, NULL),
308+
OWL_DIVIDER_HW(CMU_UART0CLK, 0, 8, CLK_DIVIDER_ROUND_CLOSEST, NULL),
309309
CLK_IGNORE_UNUSED);
310310

311311
static OWL_COMP_DIV(uart1_clk, "uart1_clk", uart_clk_mux_p,
@@ -317,31 +317,31 @@ static OWL_COMP_DIV(uart1_clk, "uart1_clk", uart_clk_mux_p,
317317
static OWL_COMP_DIV(uart2_clk, "uart2_clk", uart_clk_mux_p,
318318
OWL_MUX_HW(CMU_UART2CLK, 16, 1),
319319
OWL_GATE_HW(CMU_DEVCLKEN1, 8, 0),
320-
OWL_DIVIDER_HW(CMU_UART1CLK, 0, 8, CLK_DIVIDER_ROUND_CLOSEST, NULL),
320+
OWL_DIVIDER_HW(CMU_UART2CLK, 0, 8, CLK_DIVIDER_ROUND_CLOSEST, NULL),
321321
CLK_IGNORE_UNUSED);
322322

323323
static OWL_COMP_DIV(uart3_clk, "uart3_clk", uart_clk_mux_p,
324324
OWL_MUX_HW(CMU_UART3CLK, 16, 1),
325325
OWL_GATE_HW(CMU_DEVCLKEN1, 19, 0),
326-
OWL_DIVIDER_HW(CMU_UART1CLK, 0, 8, CLK_DIVIDER_ROUND_CLOSEST, NULL),
326+
OWL_DIVIDER_HW(CMU_UART3CLK, 0, 8, CLK_DIVIDER_ROUND_CLOSEST, NULL),
327327
CLK_IGNORE_UNUSED);
328328

329329
static OWL_COMP_DIV(uart4_clk, "uart4_clk", uart_clk_mux_p,
330330
OWL_MUX_HW(CMU_UART4CLK, 16, 1),
331331
OWL_GATE_HW(CMU_DEVCLKEN1, 20, 0),
332-
OWL_DIVIDER_HW(CMU_UART1CLK, 0, 8, CLK_DIVIDER_ROUND_CLOSEST, NULL),
332+
OWL_DIVIDER_HW(CMU_UART4CLK, 0, 8, CLK_DIVIDER_ROUND_CLOSEST, NULL),
333333
CLK_IGNORE_UNUSED);
334334

335335
static OWL_COMP_DIV(uart5_clk, "uart5_clk", uart_clk_mux_p,
336336
OWL_MUX_HW(CMU_UART5CLK, 16, 1),
337337
OWL_GATE_HW(CMU_DEVCLKEN1, 21, 0),
338-
OWL_DIVIDER_HW(CMU_UART1CLK, 0, 8, CLK_DIVIDER_ROUND_CLOSEST, NULL),
338+
OWL_DIVIDER_HW(CMU_UART5CLK, 0, 8, CLK_DIVIDER_ROUND_CLOSEST, NULL),
339339
CLK_IGNORE_UNUSED);
340340

341341
static OWL_COMP_DIV(uart6_clk, "uart6_clk", uart_clk_mux_p,
342342
OWL_MUX_HW(CMU_UART6CLK, 16, 1),
343343
OWL_GATE_HW(CMU_DEVCLKEN1, 18, 0),
344-
OWL_DIVIDER_HW(CMU_UART1CLK, 0, 8, CLK_DIVIDER_ROUND_CLOSEST, NULL),
344+
OWL_DIVIDER_HW(CMU_UART6CLK, 0, 8, CLK_DIVIDER_ROUND_CLOSEST, NULL),
345345
CLK_IGNORE_UNUSED);
346346

347347
static OWL_COMP_DIV(i2srx_clk, "i2srx_clk", i2s_clk_mux_p,

0 commit comments

Comments
 (0)