summaryrefslogtreecommitdiff
path: root/drivers/clk/clk-divider.c
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@kernel.org>2019-05-07 11:46:02 -0700
committerStephen Boyd <sboyd@kernel.org>2019-05-07 11:46:02 -0700
commit0caf000817353cfc5db22363ecdac63b83d3a3f9 (patch)
tree0921f1ab48c2b28498def22c13b9228f39a93b79 /drivers/clk/clk-divider.c
parentff060019f4e536b7456fb5d4ac7891b102cb4a44 (diff)
parent90b6c5c73c6904ac200161fc38974d867f0535b0 (diff)
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-divider.c')
-rw-r--r--drivers/clk/clk-divider.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c
index 46852e9cd4b1..3f9ff78c4a2a 100644
--- a/drivers/clk/clk-divider.c
+++ b/drivers/clk/clk-divider.c
@@ -491,7 +491,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);