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 /arch/mips | |
parent | ff060019f4e536b7456fb5d4ac7891b102cb4a44 (diff) | |
parent | 90b6c5c73c6904ac200161fc38974d867f0535b0 (diff) | |
download | linux-stable-0caf000817353cfc5db22363ecdac63b83d3a3f9.tar.gz linux-stable-0caf000817353cfc5db22363ecdac63b83d3a3f9.tar.bz2 linux-stable-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 'arch/mips')
-rw-r--r-- | arch/mips/alchemy/common/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/alchemy/common/clock.c b/arch/mips/alchemy/common/clock.c index d129475fd40d..a95a894aceaf 100644 --- a/arch/mips/alchemy/common/clock.c +++ b/arch/mips/alchemy/common/clock.c @@ -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; |