Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+6 -6
+1 -1
drivers/clk/ti/adpll.c
··· 614 614 615 615 init.name = child_name; 616 616 init.ops = ops; 617 - init.flags = CLK_IS_BASIC; 617 + init.flags = 0; 618 618 co->hw.init = &init; 619 619 parent_names[0] = __clk_get_name(clk0); 620 620 parent_names[1] = __clk_get_name(clk1);
+1 -1
drivers/clk/ti/clkctrl.c
··· 276 276 init.parent_names = parents; 277 277 init.num_parents = num_parents; 278 278 init.ops = ops; 279 - init.flags = CLK_IS_BASIC; 279 + init.flags = 0; 280 280 281 281 clk = ti_clk_register(NULL, clk_hw, init.name); 282 282 if (IS_ERR_OR_NULL(clk)) {
+1 -1
drivers/clk/ti/clockdomain.c
··· 143 143 continue; 144 144 } 145 145 clk_hw = __clk_get_hw(clk); 146 - if (clk_hw_get_flags(clk_hw) & CLK_IS_BASIC) { 146 + if (!omap2_clk_is_hw_omap(clk_hw)) { 147 147 pr_warn("can't setup clkdm for basic clk %s\n", 148 148 __clk_get_name(clk)); 149 149 continue;
+1 -1
drivers/clk/ti/divider.c
··· 336 336 337 337 init.name = name; 338 338 init.ops = &ti_clk_divider_ops; 339 - init.flags = flags | CLK_IS_BASIC; 339 + init.flags = flags; 340 340 init.parent_names = (parent_name ? &parent_name : NULL); 341 341 init.num_parents = (parent_name ? 1 : 0); 342 342
+1 -1
drivers/clk/ti/dpll3xxx.c
··· 731 731 do { 732 732 do { 733 733 hw = clk_hw_get_parent(hw); 734 - } while (hw && (clk_hw_get_flags(hw) & CLK_IS_BASIC)); 734 + } while (hw && (!omap2_clk_is_hw_omap(hw))); 735 735 if (!hw) 736 736 break; 737 737 pclk = to_clk_hw_omap(hw);
+1 -1
drivers/clk/ti/mux.c
··· 143 143 144 144 init.name = name; 145 145 init.ops = &ti_clk_mux_ops; 146 - init.flags = flags | CLK_IS_BASIC; 146 + init.flags = flags; 147 147 init.parent_names = parent_names; 148 148 init.num_parents = num_parents; 149 149