Skip to content

Commit 7915d7d

Browse files
committed
clk: amlogic: gxbb: drop non existing 32k clock parent
The 32k clock reference a parent 'cts_slow_oscin' with a fixme note saying that this clock should be provided by AO controller. The HW probably has this clock but it does not exist at the moment in any controller implementation. Furthermore, referencing clock by the global name should be avoided whenever possible. There is no reason to keep this hack around, at least for now. Fixes: 14c735c ("clk: meson-gxbb: Add EE 32K Clock for CEC") Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org> Link: https://lore.kernel.org/r/20241220-amlogic-clk-gxbb-32k-fixes-v1-2-baca56ecf2db@baylibre.com Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
1 parent f38f7fe commit 7915d7d

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/clk/meson/gxbb.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1266,14 +1266,13 @@ static struct clk_regmap gxbb_cts_i958 = {
12661266
},
12671267
};
12681268

1269+
/*
1270+
* This table skips a clock named 'cts_slow_oscin' in the documentation
1271+
* This clock does not exist yet in this controller or the AO one
1272+
*/
1273+
static u32 gxbb_32k_clk_parents_val_table[] = { 0, 2, 3 };
12691274
static const struct clk_parent_data gxbb_32k_clk_parent_data[] = {
12701275
{ .fw_name = "xtal", },
1271-
/*
1272-
* FIXME: This clock is provided by the ao clock controller but the
1273-
* clock is not yet part of the binding of this controller, so string
1274-
* name must be use to set this parent.
1275-
*/
1276-
{ .name = "cts_slow_oscin", .index = -1 },
12771276
{ .hw = &gxbb_fclk_div3.hw },
12781277
{ .hw = &gxbb_fclk_div5.hw },
12791278
};
@@ -1283,6 +1282,7 @@ static struct clk_regmap gxbb_32k_clk_sel = {
12831282
.offset = HHI_32K_CLK_CNTL,
12841283
.mask = 0x3,
12851284
.shift = 16,
1285+
.table = gxbb_32k_clk_parents_val_table,
12861286
},
12871287
.hw.init = &(struct clk_init_data){
12881288
.name = "32k_clk_sel",

0 commit comments

Comments
 (0)