Commit 09540fa3 authored by Dinh Nguyen's avatar Dinh Nguyen Committed by Stephen Boyd
Browse files

clk: socfpga: agilex: fix duplicate s2f_user0_clk 



Remove the duplicate s2f_user0_clk and the unused s2f_usr0_mux define.

Fixes: f817c132 ("clk: socfpga: agilex: fix up s2f_user0_clk representation")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDinh Nguyen <dinguyen@kernel.org>
Link: https://lore.kernel.org/r/20210916225126.1427700-1-dinguyen@kernel.org


Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 6880fa6c

drivers/clk/socfpga/clk-agilex.c

+0 −9
Original line number Diff line number Diff line
@@ -165,13 +165,6 @@ static const struct clk_parent_data mpu_mux[] = { 
	  .name = "boot_clk", },

};



static const struct clk_parent_data s2f_usr0_mux[] = {

	{ .fw_name = "f2s-free-clk",

	  .name = "f2s-free-clk", },

	{ .fw_name = "boot_clk",

	  .name = "boot_clk", },

};



static const struct clk_parent_data emac_mux[] = {

	{ .fw_name = "emaca_free_clk",

	  .name = "emaca_free_clk", },
@@ -312,8 +305,6 @@ static const struct stratix10_gate_clock agilex_gate_clks[] = { 
	  4, 0x44, 28, 1, 0, 0, 0},

	{ AGILEX_CS_TIMER_CLK, "cs_timer_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), 0, 0x24,

	  5, 0, 0, 0, 0x30, 1, 0},

	{ AGILEX_S2F_USER0_CLK, "s2f_user0_clk", NULL, s2f_usr0_mux, ARRAY_SIZE(s2f_usr0_mux), 0, 0x24,

	  6, 0, 0, 0, 0, 0, 0},

	{ AGILEX_EMAC0_CLK, "emac0_clk", NULL, emac_mux, ARRAY_SIZE(emac_mux), 0, 0x7C,

	  0, 0, 0, 0, 0x94, 26, 0},

	{ AGILEX_EMAC1_CLK, "emac1_clk", NULL, emac_mux, ARRAY_SIZE(emac_mux), 0, 0x7C,