diff options
| author |   Stephen Boyd <sboyd@kernel.org> | 2019-05-07 11:46:02 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2019-05-07 11:46:02 -0700 |
| commit | 0caf000817353cfc5db22363ecdac63b83d3a3f9 (patch) | |
| tree | 0921f1ab48c2b28498def22c13b9228f39a93b79 /drivers/clk/clk-mux.c | |
| parent | Merge branches 'clk-stm32f4', 'clk-tegra', 'clk-at91', 'clk-sifive-fu540' and 'clk-spdx' into clk-next (diff) | |
| parent | clk: Remove CLK_IS_BASIC clk flag (diff) | |
| download | linux-dev-0caf000817353cfc5db22363ecdac63b83d3a3f9.tar.xz linux-dev-0caf000817353cfc5db22363ecdac63b83d3a3f9.zip | |
Merge branch 'clk-ti' into clk-next
* clk-ti:
clk: Remove CLK_IS_BASIC clk flag
clk: ti: dra7: disable the RNG and TIMER12 clkctrl clocks on HS devices
clk: ti: dra7x: prevent non-existing clkctrl clocks from registering
ARM: omap2+: hwmod: drop CLK_IS_BASIC flag usage
clk: ti: export the omap2_clk_is_hw_omap call
Diffstat (limited to 'drivers/clk/clk-mux.c')
| -rw-r--r-- | drivers/clk/clk-mux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c index 893c9b285532..66e91f740508 100644 --- a/drivers/clk/clk-mux.c +++ b/drivers/clk/clk-mux.c @@ -175,7 +175,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; |