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

clk: socfpga: stratix10: fix naming convention for the fixed-clocks

The fixed clocks in the DTS file have a hyphen, but the clock driver has
the fixed clocks using underbar. Thus the clock driver cannot detect the
other fixed clocks correctly. Change the fixed clock names to a hyphen.

Fixes: 07afb8db7340 ("clk: socfpga: stratix10: add clock driver for
Stratix10 platform")
Cc: linux-stable@vger.kernel.org
Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

authored by

Dinh Nguyen and committed by
Stephen Boyd
b488517b c0a636e4

+10 -10
+10 -10
drivers/clk/socfpga/clk-s10.c
··· 12 12 13 13 #include "stratix10-clk.h" 14 14 15 - static const char * const pll_mux[] = { "osc1", "cb_intosc_hs_div2_clk", 16 - "f2s_free_clk",}; 15 + static const char * const pll_mux[] = { "osc1", "cb-intosc-hs-div2-clk", 16 + "f2s-free-clk",}; 17 17 static const char * const cntr_mux[] = { "main_pll", "periph_pll", 18 - "osc1", "cb_intosc_hs_div2_clk", 19 - "f2s_free_clk"}; 20 - static const char * const boot_mux[] = { "osc1", "cb_intosc_hs_div2_clk",}; 18 + "osc1", "cb-intosc-hs-div2-clk", 19 + "f2s-free-clk"}; 20 + static const char * const boot_mux[] = { "osc1", "cb-intosc-hs-div2-clk",}; 21 21 22 22 static const char * const noc_free_mux[] = {"main_noc_base_clk", 23 23 "peri_noc_base_clk", 24 - "osc1", "cb_intosc_hs_div2_clk", 25 - "f2s_free_clk"}; 24 + "osc1", "cb-intosc-hs-div2-clk", 25 + "f2s-free-clk"}; 26 26 27 27 static const char * const emaca_free_mux[] = {"peri_emaca_clk", "boot_clk"}; 28 28 static const char * const emacb_free_mux[] = {"peri_emacb_clk", "boot_clk"}; ··· 33 33 static const char * const psi_ref_free_mux[] = {"peri_psi_ref_clk", "boot_clk"}; 34 34 static const char * const mpu_mux[] = { "mpu_free_clk", "boot_clk",}; 35 35 36 - static const char * const s2f_usr0_mux[] = {"f2s_free_clk", "boot_clk"}; 36 + static const char * const s2f_usr0_mux[] = {"f2s-free-clk", "boot_clk"}; 37 37 static const char * const emac_mux[] = {"emaca_free_clk", "emacb_free_clk"}; 38 38 static const char * const noc_mux[] = {"noc_free_clk", "boot_clk"}; 39 39 40 40 static const char * const mpu_free_mux[] = {"main_mpu_base_clk", 41 41 "peri_mpu_base_clk", 42 - "osc1", "cb_intosc_hs_div2_clk", 43 - "f2s_free_clk"}; 42 + "osc1", "cb-intosc-hs-div2-clk", 43 + "f2s-free-clk"}; 44 44 45 45 /* clocks in AO (always on) controller */ 46 46 static const struct stratix10_pll_clock s10_pll_clks[] = {