clk: ti: remove usage of CLK_IS_BASIC

Remove the usage of CLK_IS_BASIC flag completely from TI clock driver.
In most cases, the use is completely redundant, but in some cases
we need to use the new API to check if the clock is an OMAP clock or not.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Tested-by: Keerthy <j-keerthy@ti.com>

diff --git a/drivers/clk/ti/adpll.c b/drivers/clk/ti/adpll.c
index 688e403333b914ef900a001c452da96110a40cd0..0c210984765af3d06cf3fb2ce15bf31570ac7cf5 100644 (file)
--- a/drivers/clk/ti/adpll.c
+++ b/drivers/clk/ti/adpll.c
@@ -614,7 +614,7 @@ static int ti_adpll_init_clkout(struct ti_adpll_data *d,
 
        init.name = child_name;
        init.ops = ops;
-       init.flags = CLK_IS_BASIC;
+       init.flags = 0;
        co->hw.init = &init;
        parent_names[0] = __clk_get_name(clk0);
        parent_names[1] = __clk_get_name(clk1);

diff --git a/drivers/clk/ti/clkctrl.c b/drivers/clk/ti/clkctrl.c
index 40630eb950fcb5b66ba48baf332e33f9b9ee3345..bf32d996177f415fb1aaca9e527fd9cc1daf186c 100644 (file)
--- a/drivers/clk/ti/clkctrl.c
+++ b/drivers/clk/ti/clkctrl.c
@@ -276,7 +276,7 @@ _ti_clkctrl_clk_register(struct omap_clkctrl_provider *provider,
        init.parent_names = parents;
        init.num_parents = num_parents;
        init.ops = ops;
-       init.flags = CLK_IS_BASIC;
+       init.flags = 0;
 
        clk = ti_clk_register(NULL, clk_hw, init.name);
        if (IS_ERR_OR_NULL(clk)) {

diff --git a/drivers/clk/ti/clockdomain.c b/drivers/clk/ti/clockdomain.c
index 07a805125e98cff774ed864f40f25032b49c8822..423a99b9f10c762cc0cc275a2cf935bc81e6ef4c 100644 (file)
--- a/drivers/clk/ti/clockdomain.c
+++ b/drivers/clk/ti/clockdomain.c
@@ -143,7 +143,7 @@ static void __init of_ti_clockdomain_setup(struct device_node *node)
                        continue;
                }
                clk_hw = __clk_get_hw(clk);
-               if (clk_hw_get_flags(clk_hw) & CLK_IS_BASIC) {
+               if (!omap2_clk_is_hw_omap(clk_hw)) {
                        pr_warn("can't setup clkdm for basic clk %s\n",
                                __clk_get_name(clk));
                        continue;

diff --git a/drivers/clk/ti/divider.c b/drivers/clk/ti/divider.c
index 8d77090ad94aecd283ee085bb77a81491c9c6978..cb5a81963ba9d6fd85ec5241198554736c5b0043 100644 (file)
--- a/drivers/clk/ti/divider.c
+++ b/drivers/clk/ti/divider.c
@@ -336,7 +336,7 @@ static struct clk *_register_divider(struct device *dev, const char *name,
 
        init.name = name;
        init.ops = &ti_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);
 

diff --git a/drivers/clk/ti/dpll3xxx.c b/drivers/clk/ti/dpll3xxx.c
index 44b6b6403753c95845048910838c4567c79f91d4..3dde6c8c3354f62de91677068fe0427345b64584 100644 (file)
--- a/drivers/clk/ti/dpll3xxx.c
+++ b/drivers/clk/ti/dpll3xxx.c
@@ -731,7 +731,7 @@ static struct clk_hw_omap *omap3_find_clkoutx2_dpll(struct clk_hw *hw)
        do {
                do {
                        hw = clk_hw_get_parent(hw);
-               } while (hw && (clk_hw_get_flags(hw) & CLK_IS_BASIC));
+               } while (hw && (!omap2_clk_is_hw_omap(hw)));
                if (!hw)
                        break;
                pclk = to_clk_hw_omap(hw);

diff --git a/drivers/clk/ti/mux.c b/drivers/clk/ti/mux.c
index 883bdde94d048643c1ff98239305b2f6393c1339..b7f9a4f068bf69aafd2a94da66cd6d486b70564b 100644 (file)
--- a/drivers/clk/ti/mux.c
+++ b/drivers/clk/ti/mux.c
@@ -143,7 +143,7 @@ static struct clk *_register_mux(struct device *dev, const char *name,
 
        init.name = name;
        init.ops = &ti_clk_mux_ops;
-       init.flags = flags | CLK_IS_BASIC;
+       init.flags = flags;
        init.parent_names = parent_names;
        init.num_parents = num_parents;