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.c | |
| 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 'drivers/clk/clk.c')
| -rw-r--r-- | drivers/clk/clk.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index a72520720783..3e1708747cd2 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -2851,7 +2851,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), |