Merge branch 'clk-ti' into clk-next
authorStephen Boyd <sboyd@kernel.org>
Tue, 7 May 2019 18:46:02 +0000 (11:46 -0700)
committerStephen Boyd <sboyd@kernel.org>
Tue, 7 May 2019 18:46:02 +0000 (11:46 -0700)
commit0caf000817353cfc5db22363ecdac63b83d3a3f9
tree0921f1ab48c2b28498def22c13b9228f39a93b79
parentff060019f4e536b7456fb5d4ac7891b102cb4a44
parent90b6c5c73c6904ac200161fc38974d867f0535b0
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
drivers/clk/clk-divider.c
drivers/clk/clk-fractional-divider.c
drivers/clk/clk-gate.c
drivers/clk/clk-mux.c
drivers/clk/clk.c
include/linux/clk-provider.h