Merge tag 'ti-clk-for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/kristo/linux into clk-ti

Pull TI clock driver updates from Tero Kristo:

Contains the CLK_IS_BASIC flag cleanup, getting rid of the flag
completely from TI clock driver.

Also contains the autoidle clock support series from Andreas Kemnade,
which is needed for handling the hdq clocks properly during low power
states; at least on gta04 board.

* tag 'ti-clk-for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/kristo/linux:
  ARM: OMAP2+: hwmod: disable ick autoidling when a hwmod requires that
  clk: ti: check clock type before doing autoidle ops
  clk: ti: add a usecount for autoidle
  clk: ti: generalize the init sequence of clk_hw_omap clocks
  clk: ti: remove usage of CLK_IS_BASIC
  clk: ti: add new API for checking if a provided clock is an OMAP clock
  clk: ti: move clk_hw_omap list handling under generic part of the driver

1 files changed, 4 insertions, 7 deletions

diff --git a/drivers/clk/ti/dpll.c b/drivers/clk/ti/dpll.c
index 6c3329bc116f..659dadb23279 100644
--- a/drivers/clk/ti/dpll.c
+++ b/drivers/clk/ti/dpll.c
@@ -192,10 +192,9 @@ static void __init _register_dpll(void *user,
         dd->clk_bypass = __clk_get_hw(clk);
 
         /* register the clock */
-        clk = ti_clk_register(NULL, &clk_hw->hw, node->name);
+        clk = ti_clk_register_omap_hw(NULL, &clk_hw->hw, node->name);
 
         if (!IS_ERR(clk)) {
-                omap2_init_clk_hw_omap_clocks(&clk_hw->hw);
                 of_clk_add_provider(node, of_clk_src_simple_get, clk);
                 kfree(clk_hw->hw.init->parent_names);
                 kfree(clk_hw->hw.init);
@@ -265,14 +264,12 @@ static void _register_dpll_x2(struct device_node *node,
 #endif
 
         /* register the clock */
-        clk = ti_clk_register(NULL, &clk_hw->hw, name);
+        clk = ti_clk_register_omap_hw(NULL, &clk_hw->hw, name);
 
-        if (IS_ERR(clk)) {
+        if (IS_ERR(clk))
                 kfree(clk_hw);
-        } else {
-                omap2_init_clk_hw_omap_clocks(&clk_hw->hw);
+        else
                 of_clk_add_provider(node, of_clk_src_simple_get, clk);
-        }
 }
 #endif