Skip to content

Commit

Permalink
clk: Remove CLK_IS_BASIC clk flag
Browse files Browse the repository at this point in the history
This flag was historically used to indicate that a clk is a "basic" type
of clk like a mux, divider, gate, etc. This never turned out to be very
useful though because it was hard to cleanly split "basic" clks from
other clks in a system. This one flag was a way for type introspection
and it just didn't scale. If anything, it was used by the TI clk driver
to indicate that a clk_hw wasn't contained in the SoC specific clk
structure. We can get rid of this define now that TI is finding those
clks a different way.

Cc: Tero Kristo <t-kristo@ti.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Paul Burton <paul.burton@mips.com>
Cc: James Hogan <jhogan@kernel.org>
Cc: <linux-mips@vger.kernel.org>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: <linux-pwm@vger.kernel.org>
Cc: <linux-amlogic@lists.infradead.org>
Acked-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
  • Loading branch information
bebarino committed Apr 26, 2019
1 parent 869decd commit 90b6c5c
Show file tree
Hide file tree
Showing 14 changed files with 13 additions and 14 deletions.
2 changes: 1 addition & 1 deletion arch/mips/alchemy/common/clock.c
Expand Up @@ -160,7 +160,7 @@ static struct clk __init *alchemy_clk_setup_cpu(const char *parent_name,
id.name = ALCHEMY_CPU_CLK;
id.parent_names = &parent_name;
id.num_parents = 1;
id.flags = CLK_IS_BASIC;
id.flags = 0;
id.ops = &alchemy_clkops_cpu;
h->init = &id;

Expand Down
2 changes: 1 addition & 1 deletion drivers/clk/clk-composite.c
Expand Up @@ -218,7 +218,7 @@ struct clk_hw *clk_hw_register_composite(struct device *dev, const char *name,
return ERR_PTR(-ENOMEM);

init.name = name;
init.flags = flags | CLK_IS_BASIC;
init.flags = flags;
init.parent_names = parent_names;
init.num_parents = num_parents;
hw = &composite->hw;
Expand Down
2 changes: 1 addition & 1 deletion drivers/clk/clk-divider.c
Expand Up @@ -475,7 +475,7 @@ static struct clk_hw *_register_divider(struct device *dev, const char *name,
init.ops = &clk_divider_ro_ops;
else
init.ops = &clk_divider_ops;
init.flags = flags | CLK_IS_BASIC;
init.flags = flags;
init.parent_names = (parent_name ? &parent_name: NULL);
init.num_parents = (parent_name ? 1 : 0);

Expand Down
2 changes: 1 addition & 1 deletion drivers/clk/clk-fixed-factor.c
Expand Up @@ -84,7 +84,7 @@ struct clk_hw *clk_hw_register_fixed_factor(struct device *dev,

init.name = name;
init.ops = &clk_fixed_factor_ops;
init.flags = flags | CLK_IS_BASIC;
init.flags = flags;
init.parent_names = &parent_name;
init.num_parents = 1;

Expand Down
2 changes: 1 addition & 1 deletion drivers/clk/clk-fixed-rate.c
Expand Up @@ -68,7 +68,7 @@ struct clk_hw *clk_hw_register_fixed_rate_with_accuracy(struct device *dev,

init.name = name;
init.ops = &clk_fixed_rate_ops;
init.flags = flags | CLK_IS_BASIC;
init.flags = flags;
init.parent_names = (parent_name ? &parent_name: NULL);
init.num_parents = (parent_name ? 1 : 0);

Expand Down
2 changes: 1 addition & 1 deletion drivers/clk/clk-fractional-divider.c
Expand Up @@ -151,7 +151,7 @@ struct clk_hw *clk_hw_register_fractional_divider(struct device *dev,

init.name = name;
init.ops = &clk_fractional_divider_ops;
init.flags = flags | CLK_IS_BASIC;
init.flags = flags;
init.parent_names = parent_name ? &parent_name : NULL;
init.num_parents = parent_name ? 1 : 0;

Expand Down
2 changes: 1 addition & 1 deletion drivers/clk/clk-gate.c
Expand Up @@ -142,7 +142,7 @@ struct clk_hw *clk_hw_register_gate(struct device *dev, const char *name,

init.name = name;
init.ops = &clk_gate_ops;
init.flags = flags | CLK_IS_BASIC;
init.flags = flags;
init.parent_names = parent_name ? &parent_name : NULL;
init.num_parents = parent_name ? 1 : 0;

Expand Down
2 changes: 1 addition & 1 deletion drivers/clk/clk-gpio.c
Expand Up @@ -137,7 +137,7 @@ static struct clk_hw *clk_register_gpio(struct device *dev, const char *name,

init.name = name;
init.ops = clk_gpio_ops;
init.flags = flags | CLK_IS_BASIC;
init.flags = flags;
init.parent_names = parent_names;
init.num_parents = num_parents;

Expand Down
2 changes: 1 addition & 1 deletion drivers/clk/clk-mux.c
Expand Up @@ -159,7 +159,7 @@ struct clk_hw *clk_hw_register_mux_table(struct device *dev, const char *name,
init.ops = &clk_mux_ro_ops;
else
init.ops = &clk_mux_ops;
init.flags = flags | CLK_IS_BASIC;
init.flags = flags;
init.parent_names = parent_names;
init.num_parents = num_parents;

Expand Down
2 changes: 1 addition & 1 deletion drivers/clk/clk-pwm.c
Expand Up @@ -101,7 +101,7 @@ static int clk_pwm_probe(struct platform_device *pdev)

init.name = clk_name;
init.ops = &clk_pwm_ops;
init.flags = CLK_IS_BASIC;
init.flags = 0;
init.num_parents = 0;

clk_pwm->pwm = pwm;
Expand Down
1 change: 0 additions & 1 deletion drivers/clk/clk.c
Expand Up @@ -2850,7 +2850,6 @@ static const struct {
ENTRY(CLK_SET_PARENT_GATE),
ENTRY(CLK_SET_RATE_PARENT),
ENTRY(CLK_IGNORE_UNUSED),
ENTRY(CLK_IS_BASIC),
ENTRY(CLK_GET_RATE_NOCACHE),
ENTRY(CLK_SET_RATE_NO_REPARENT),
ENTRY(CLK_GET_ACCURACY_NOCACHE),
Expand Down
2 changes: 1 addition & 1 deletion drivers/clk/mmp/clk-gate.c
Expand Up @@ -108,7 +108,7 @@ struct clk *mmp_clk_register_gate(struct device *dev, const char *name,

init.name = name;
init.ops = &mmp_clk_gate_ops;
init.flags = flags | CLK_IS_BASIC;
init.flags = flags;
init.parent_names = (parent_name ? &parent_name : NULL);
init.num_parents = (parent_name ? 1 : 0);

Expand Down
2 changes: 1 addition & 1 deletion drivers/pwm/pwm-meson.c
Expand Up @@ -470,7 +470,7 @@ static int meson_pwm_init_channels(struct meson_pwm *meson,

init.name = name;
init.ops = &clk_mux_ops;
init.flags = CLK_IS_BASIC;
init.flags = 0;
init.parent_names = meson->data->parent_names;
init.num_parents = meson->data->num_parents;

Expand Down
2 changes: 1 addition & 1 deletion include/linux/clk-provider.h
Expand Up @@ -24,7 +24,7 @@
#define CLK_SET_RATE_PARENT BIT(2) /* propagate rate change up one level */
#define CLK_IGNORE_UNUSED BIT(3) /* do not gate even if unused */
/* unused */
#define CLK_IS_BASIC BIT(5) /* Basic clk, can't do a to_clk_foo() */
/* unused */
#define CLK_GET_RATE_NOCACHE BIT(6) /* do not use the cached clk rate */
#define CLK_SET_RATE_NO_REPARENT BIT(7) /* don't re-parent on rate change */
#define CLK_GET_ACCURACY_NOCACHE BIT(8) /* do not use the cached clk accuracy */
Expand Down

0 comments on commit 90b6c5c

Please sign in to comment.