Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

clk: socfpga: agilex: fix duplicate s2f_user0_clk

Remove the duplicate s2f_user0_clk and the unused s2f_usr0_mux define.

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

authored by

Dinh Nguyen and committed by
Stephen Boyd
09540fa3 6880fa6c

-9
-9
drivers/clk/socfpga/clk-agilex.c
··· 165 165 .name = "boot_clk", }, 166 166 }; 167 167 168 - static const struct clk_parent_data s2f_usr0_mux[] = { 169 - { .fw_name = "f2s-free-clk", 170 - .name = "f2s-free-clk", }, 171 - { .fw_name = "boot_clk", 172 - .name = "boot_clk", }, 173 - }; 174 - 175 168 static const struct clk_parent_data emac_mux[] = { 176 169 { .fw_name = "emaca_free_clk", 177 170 .name = "emaca_free_clk", }, ··· 305 312 4, 0x44, 28, 1, 0, 0, 0}, 306 313 { AGILEX_CS_TIMER_CLK, "cs_timer_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), 0, 0x24, 307 314 5, 0, 0, 0, 0x30, 1, 0}, 308 - { AGILEX_S2F_USER0_CLK, "s2f_user0_clk", NULL, s2f_usr0_mux, ARRAY_SIZE(s2f_usr0_mux), 0, 0x24, 309 - 6, 0, 0, 0, 0, 0, 0}, 310 315 { AGILEX_EMAC0_CLK, "emac0_clk", NULL, emac_mux, ARRAY_SIZE(emac_mux), 0, 0x7C, 311 316 0, 0, 0, 0, 0x94, 26, 0}, 312 317 { AGILEX_EMAC1_CLK, "emac1_clk", NULL, emac_mux, ARRAY_SIZE(emac_mux), 0, 0x7C,