Messages in this thread Patch in this message | | | From | Claudiu Beznea <> | Subject | [PATCH 30/42] clk: at91: clk-i2s-mux: remove parent_names support | Date | Thu, 27 Jul 2023 08:31:44 +0300 |
| |
Remove parent_names support as parent_hw support is now available on all platforms using clk-i2s-mux driver.
Signed-off-by: Claudiu Beznea <claudiu.beznea@tuxon.dev> --- drivers/clk/at91/clk-i2s-mux.c | 8 ++------ drivers/clk/at91/dt-compat.c | 2 +- drivers/clk/at91/pmc.h | 3 +-- drivers/clk/at91/sama5d2.c | 4 ++-- 4 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/drivers/clk/at91/clk-i2s-mux.c b/drivers/clk/at91/clk-i2s-mux.c index f1981b8ee18d..ea84e8f5becd 100644 --- a/drivers/clk/at91/clk-i2s-mux.c +++ b/drivers/clk/at91/clk-i2s-mux.c @@ -50,8 +50,7 @@ static const struct clk_ops clk_i2s_mux_ops = { struct clk_hw * __init at91_clk_i2s_mux_register(struct regmap *regmap, const char *name, - const char * const *parent_names, struct clk_hw **parent_hws, - unsigned int num_parents, u8 bus_id) + struct clk_hw **parent_hws, unsigned int num_parents, u8 bus_id) { struct clk_init_data init = {}; struct clk_i2s_mux *i2s_ck; @@ -63,10 +62,7 @@ at91_clk_i2s_mux_register(struct regmap *regmap, const char *name, init.name = name; init.ops = &clk_i2s_mux_ops; - if (parent_hws) - init.parent_hws = (const struct clk_hw **)parent_hws; - else - init.parent_names = parent_names; + init.parent_hws = (const struct clk_hw **)parent_hws; init.num_parents = num_parents; i2s_ck->hw.init = &init; diff --git a/drivers/clk/at91/dt-compat.c b/drivers/clk/at91/dt-compat.c index 058b65c2d88d..7ab116a6e701 100644 --- a/drivers/clk/at91/dt-compat.c +++ b/drivers/clk/at91/dt-compat.c @@ -279,7 +279,7 @@ static void __init of_sama5d2_clk_i2s_mux_setup(struct device_node *np) continue; hw = at91_clk_i2s_mux_register(regmap_sfr, i2s_mux_np->name, - NULL, parent_hws, 2, bus_id); + parent_hws, 2, bus_id); if (IS_ERR(hw)) continue; diff --git a/drivers/clk/at91/pmc.h b/drivers/clk/at91/pmc.h index 11f7ab4d1ad8..07f372abcfd0 100644 --- a/drivers/clk/at91/pmc.h +++ b/drivers/clk/at91/pmc.h @@ -153,8 +153,7 @@ at91_clk_register_h32mx(struct regmap *regmap, const char *name, struct clk_hw * __init at91_clk_i2s_mux_register(struct regmap *regmap, const char *name, - const char * const *parent_names, struct clk_hw **parent_hws, - unsigned int num_parents, u8 bus_id); + struct clk_hw **parent_hws, unsigned int num_parents, u8 bus_id); struct clk_hw * __init at91_clk_register_main_rc_osc(struct regmap *regmap, const char *name, diff --git a/drivers/clk/at91/sama5d2.c b/drivers/clk/at91/sama5d2.c index 93c646e0b6ef..17a40cedd7fb 100644 --- a/drivers/clk/at91/sama5d2.c +++ b/drivers/clk/at91/sama5d2.c @@ -385,7 +385,7 @@ static void __init sama5d2_pmc_setup(struct device_node *np) parent_hws[0] = sama5d2_pmc->phws[54]; /* i2s0_clk */ parent_hws[1] = sama5d2_pmc->phws[54]; /* i2s0_gclk */ hw = at91_clk_i2s_mux_register(regmap_sfr, "i2s0_muxclk", - NULL, parent_hws, 2, 0); + parent_hws, 2, 0); if (IS_ERR(hw)) goto err_free; @@ -394,7 +394,7 @@ static void __init sama5d2_pmc_setup(struct device_node *np) parent_hws[0] = sama5d2_pmc->phws[55]; /* i2s1_clk */ parent_hws[1] = sama5d2_pmc->ghws[55]; /* i2s1_gclk */ hw = at91_clk_i2s_mux_register(regmap_sfr, "i2s1_muxclk", - NULL, parent_hws, 2, 1); + parent_hws, 2, 1); if (IS_ERR(hw)) goto err_free; -- 2.39.2
| |