]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
clk: thead: th1520-ap: Correctly refer the parent of osc_12m
authorYao Zi <ziyao@disroot.org>
Thu, 10 Jul 2025 09:21:34 +0000 (09:21 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 15 Aug 2025 14:39:07 +0000 (16:39 +0200)
[ Upstream commit d274c77ffa202b70ad01d579f33b73b4de123375 ]

The "osc_12m" fixed factor clock refers the external oscillator by
setting clk_parent_data.fw_name to osc_24m, which is obviously wrong
since no clock-names property is allowed for compatible
thead,th1520-clk-ap.

Refer the oscillator as parent by index instead.

Fixes: ae81b69fd2b1 ("clk: thead: Add support for T-Head TH1520 AP_SUBSYS clocks")
Signed-off-by: Yao Zi <ziyao@disroot.org>
Reviewed-by: Drew Fustini <fustini@kernel.org>
Signed-off-by: Drew Fustini <fustini@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/clk/thead/clk-th1520-ap.c

index ebfb1d59401d05443716eb0029403b01775e8f73..42feb4bb63299a4096f9153addb18682df293709 100644 (file)
@@ -582,7 +582,14 @@ static const struct clk_parent_data peri2sys_apb_pclk_pd[] = {
        { .hw = &peri2sys_apb_pclk.common.hw }
 };
 
-static CLK_FIXED_FACTOR_FW_NAME(osc12m_clk, "osc_12m", "osc_24m", 2, 1, 0);
+static struct clk_fixed_factor osc12m_clk = {
+       .div            = 2,
+       .mult           = 1,
+       .hw.init        = CLK_HW_INIT_PARENTS_DATA("osc_12m",
+                                                  osc_24m_clk,
+                                                  &clk_fixed_factor_ops,
+                                                  0),
+};
 
 static const char * const out_parents[] = { "osc_24m", "osc_12m" };