Skip to content

Commit ab8cfde

Browse files
committed
Merge tag 'thead-clk-for-v6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux into clk-thead
Pull T-HEAD TH1520 clk driver updates from Drew Fustini: - Fix the parent data for osc_12m by referencing osc_24m by index. - Mark essential bus clocks as CLK_IGNORE_UNUSED to fix boot hang associated with the PVT sensor. * tag 'thead-clk-for-v6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux: clk: thead: th1520-ap: Correctly refer the parent of osc_12m clk: thead: Mark essential bus clocks as CLK_IGNORE_UNUSED
2 parents 19272b3 + d274c77 commit ab8cfde

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

drivers/clk/thead/clk-th1520-ap.c

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,14 @@ static const struct clk_parent_data peri2sys_apb_pclk_pd[] = {
582582
{ .hw = &peri2sys_apb_pclk.common.hw }
583583
};
584584

585-
static CLK_FIXED_FACTOR_FW_NAME(osc12m_clk, "osc_12m", "osc_24m", 2, 1, 0);
585+
static struct clk_fixed_factor osc12m_clk = {
586+
.div = 2,
587+
.mult = 1,
588+
.hw.init = CLK_HW_INIT_PARENTS_DATA("osc_12m",
589+
osc_24m_clk,
590+
&clk_fixed_factor_ops,
591+
0),
592+
};
586593

587594
static const char * const out_parents[] = { "osc_24m", "osc_12m" };
588595

@@ -792,11 +799,12 @@ static CCU_GATE(CLK_AON2CPU_A2X, aon2cpu_a2x_clk, "aon2cpu-a2x", axi4_cpusys2_ac
792799
0x134, BIT(8), 0);
793800
static CCU_GATE(CLK_X2X_CPUSYS, x2x_cpusys_clk, "x2x-cpusys", axi4_cpusys2_aclk_pd,
794801
0x134, BIT(7), 0);
795-
static CCU_GATE(CLK_CPU2AON_X2H, cpu2aon_x2h_clk, "cpu2aon-x2h", axi_aclk_pd, 0x138, BIT(8), 0);
802+
static CCU_GATE(CLK_CPU2AON_X2H, cpu2aon_x2h_clk, "cpu2aon-x2h", axi_aclk_pd,
803+
0x138, BIT(8), CLK_IGNORE_UNUSED);
796804
static CCU_GATE(CLK_CPU2PERI_X2H, cpu2peri_x2h_clk, "cpu2peri-x2h", axi4_cpusys2_aclk_pd,
797805
0x140, BIT(9), CLK_IGNORE_UNUSED);
798806
static CCU_GATE(CLK_PERISYS_APB1_HCLK, perisys_apb1_hclk, "perisys-apb1-hclk", perisys_ahb_hclk_pd,
799-
0x150, BIT(9), 0);
807+
0x150, BIT(9), CLK_IGNORE_UNUSED);
800808
static CCU_GATE(CLK_PERISYS_APB2_HCLK, perisys_apb2_hclk, "perisys-apb2-hclk", perisys_ahb_hclk_pd,
801809
0x150, BIT(10), CLK_IGNORE_UNUSED);
802810
static CCU_GATE(CLK_PERISYS_APB3_HCLK, perisys_apb3_hclk, "perisys-apb3-hclk", perisys_ahb_hclk_pd,

0 commit comments

Comments
 (0)