Commit 98d8a60e authored by Stephen Boyd's avatar Stephen Boyd Committed by Michael Turquette

clk: Convert __clk_get_flags() to clk_hw_get_flags()

Mostly converted with the following snippet:

@@
struct clk_hw *E;
@@

-__clk_get_flags(E->clk)
+clk_hw_get_flags(E)
Acked-by: default avatarTero Kristo <t-kristo@ti.com>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Acked-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Daniel Thompson <daniel.thompson@linaro.org>
Cc: Coquelin <mcoquelin.stm32@gmail.com>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 497295af
...@@ -310,7 +310,7 @@ static long cdce706_divider_round_rate(struct clk_hw *hw, unsigned long rate, ...@@ -310,7 +310,7 @@ static long cdce706_divider_round_rate(struct clk_hw *hw, unsigned long rate,
if (!mul) if (!mul)
div = CDCE706_DIVIDER_DIVIDER_MAX; div = CDCE706_DIVIDER_DIVIDER_MAX;
if (__clk_get_flags(hw->clk) & CLK_SET_RATE_PARENT) { if (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT) {
unsigned long best_diff = rate; unsigned long best_diff = rate;
unsigned long best_div = 0; unsigned long best_div = 0;
struct clk *gp_clk = cdce->clkin_clk[cdce->clkin[0].parent]; struct clk *gp_clk = cdce->clkin_clk[cdce->clkin[0].parent];
......
...@@ -78,7 +78,7 @@ static int clk_composite_determine_rate(struct clk_hw *hw, ...@@ -78,7 +78,7 @@ static int clk_composite_determine_rate(struct clk_hw *hw,
mux_hw && mux_ops && mux_ops->set_parent) { mux_hw && mux_ops && mux_ops->set_parent) {
req->best_parent_hw = NULL; req->best_parent_hw = NULL;
if (__clk_get_flags(hw->clk) & CLK_SET_RATE_NO_REPARENT) { if (clk_hw_get_flags(hw) & CLK_SET_RATE_NO_REPARENT) {
parent = clk_get_parent(mux_hw->clk); parent = clk_get_parent(mux_hw->clk);
req->best_parent_hw = __clk_get_hw(parent); req->best_parent_hw = __clk_get_hw(parent);
req->best_parent_rate = __clk_get_rate(parent); req->best_parent_rate = __clk_get_rate(parent);
......
...@@ -290,7 +290,7 @@ static int clk_divider_bestdiv(struct clk_hw *hw, unsigned long rate, ...@@ -290,7 +290,7 @@ static int clk_divider_bestdiv(struct clk_hw *hw, unsigned long rate,
maxdiv = _get_maxdiv(table, width, flags); maxdiv = _get_maxdiv(table, width, flags);
if (!(__clk_get_flags(hw->clk) & CLK_SET_RATE_PARENT)) { if (!(clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT)) {
parent_rate = *best_parent_rate; parent_rate = *best_parent_rate;
bestdiv = _div_round(table, parent_rate, rate, flags); bestdiv = _div_round(table, parent_rate, rate, flags);
bestdiv = bestdiv == 0 ? 1 : bestdiv; bestdiv = bestdiv == 0 ? 1 : bestdiv;
......
...@@ -41,7 +41,7 @@ static long clk_factor_round_rate(struct clk_hw *hw, unsigned long rate, ...@@ -41,7 +41,7 @@ static long clk_factor_round_rate(struct clk_hw *hw, unsigned long rate,
{ {
struct clk_fixed_factor *fix = to_clk_fixed_factor(hw); struct clk_fixed_factor *fix = to_clk_fixed_factor(hw);
if (__clk_get_flags(hw->clk) & CLK_SET_RATE_PARENT) { if (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT) {
unsigned long best_parent; unsigned long best_parent;
best_parent = (rate / fix->mult) * fix->div; best_parent = (rate / fix->mult) * fix->div;
......
...@@ -663,7 +663,7 @@ static long si5351_msynth_round_rate(struct clk_hw *hw, unsigned long rate, ...@@ -663,7 +663,7 @@ static long si5351_msynth_round_rate(struct clk_hw *hw, unsigned long rate,
divby4 = 1; divby4 = 1;
/* multisync can set pll */ /* multisync can set pll */
if (__clk_get_flags(hwdata->hw.clk) & CLK_SET_RATE_PARENT) { if (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT) {
/* /*
* find largest integer divider for max * find largest integer divider for max
* vco frequency and given target rate * vco frequency and given target rate
...@@ -1013,7 +1013,7 @@ static long si5351_clkout_round_rate(struct clk_hw *hw, unsigned long rate, ...@@ -1013,7 +1013,7 @@ static long si5351_clkout_round_rate(struct clk_hw *hw, unsigned long rate,
rate = SI5351_CLKOUT_MIN_FREQ; rate = SI5351_CLKOUT_MIN_FREQ;
/* request frequency if multisync master */ /* request frequency if multisync master */
if (__clk_get_flags(hwdata->hw.clk) & CLK_SET_RATE_PARENT) { if (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT) {
/* use r divider for frequencies below 1MHz */ /* use r divider for frequencies below 1MHz */
rdiv = SI5351_OUTPUT_CLK_DIV_1; rdiv = SI5351_OUTPUT_CLK_DIV_1;
while (rate < SI5351_MULTISYNTH_MIN_FREQ && while (rate < SI5351_MULTISYNTH_MIN_FREQ &&
......
...@@ -175,7 +175,7 @@ static long clk_apb_mul_round_rate(struct clk_hw *hw, unsigned long rate, ...@@ -175,7 +175,7 @@ static long clk_apb_mul_round_rate(struct clk_hw *hw, unsigned long rate,
if (readl(base + STM32F4_RCC_CFGR) & BIT(am->bit_idx)) if (readl(base + STM32F4_RCC_CFGR) & BIT(am->bit_idx))
mult = 2; mult = 2;
if (__clk_get_flags(hw->clk) & CLK_SET_RATE_PARENT) { if (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT) {
unsigned long best_parent = rate / mult; unsigned long best_parent = rate / mult;
*prate = *prate =
......
...@@ -420,7 +420,7 @@ static int _freq_tbl_determine_rate(struct clk_hw *hw, const struct freq_tbl *f, ...@@ -420,7 +420,7 @@ static int _freq_tbl_determine_rate(struct clk_hw *hw, const struct freq_tbl *f,
if (index < 0) if (index < 0)
return index; return index;
clk_flags = __clk_get_flags(hw->clk); clk_flags = clk_hw_get_flags(hw);
p = clk_get_parent_by_index(hw->clk, index); p = clk_get_parent_by_index(hw->clk, index);
if (clk_flags & CLK_SET_RATE_PARENT) { if (clk_flags & CLK_SET_RATE_PARENT) {
rate = rate * f->pre_div; rate = rate * f->pre_div;
......
...@@ -192,7 +192,7 @@ static int _freq_tbl_determine_rate(struct clk_hw *hw, ...@@ -192,7 +192,7 @@ static int _freq_tbl_determine_rate(struct clk_hw *hw,
if (index < 0) if (index < 0)
return index; return index;
clk_flags = __clk_get_flags(hw->clk); clk_flags = clk_hw_get_flags(hw);
p = clk_get_parent_by_index(hw->clk, index); p = clk_get_parent_by_index(hw->clk, index);
if (clk_flags & CLK_SET_RATE_PARENT) { if (clk_flags & CLK_SET_RATE_PARENT) {
if (f->pre_div) { if (f->pre_div) {
......
...@@ -109,7 +109,7 @@ static long flexgen_round_rate(struct clk_hw *hw, unsigned long rate, ...@@ -109,7 +109,7 @@ static long flexgen_round_rate(struct clk_hw *hw, unsigned long rate,
/* Round div according to exact prate and wished rate */ /* Round div according to exact prate and wished rate */
div = clk_best_div(*prate, rate); div = clk_best_div(*prate, rate);
if (__clk_get_flags(hw->clk) & CLK_SET_RATE_PARENT) { if (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT) {
*prate = rate * div; *prate = rate * div;
return rate; return rate;
} }
......
...@@ -92,7 +92,7 @@ static int clk_factors_determine_rate(struct clk_hw *hw, ...@@ -92,7 +92,7 @@ static int clk_factors_determine_rate(struct clk_hw *hw,
parent = clk_get_parent_by_index(clk, i); parent = clk_get_parent_by_index(clk, i);
if (!parent) if (!parent)
continue; continue;
if (__clk_get_flags(clk) & CLK_SET_RATE_PARENT) if (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT)
parent_rate = __clk_round_rate(parent, req->rate); parent_rate = __clk_round_rate(parent, req->rate);
else else
parent_rate = __clk_get_rate(parent); parent_rate = __clk_get_rate(parent);
......
...@@ -133,7 +133,7 @@ static int sun6i_ahb1_clk_determine_rate(struct clk_hw *hw, ...@@ -133,7 +133,7 @@ static int sun6i_ahb1_clk_determine_rate(struct clk_hw *hw,
parent = clk_get_parent_by_index(clk, i); parent = clk_get_parent_by_index(clk, i);
if (!parent) if (!parent)
continue; continue;
if (__clk_get_flags(clk) & CLK_SET_RATE_PARENT) if (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT)
parent_rate = __clk_round_rate(parent, req->rate); parent_rate = __clk_round_rate(parent, req->rate);
else else
parent_rate = __clk_get_rate(parent); parent_rate = __clk_get_rate(parent);
......
...@@ -339,11 +339,11 @@ struct clk __init *ti_clk_register_clk(struct ti_clk *setup) ...@@ -339,11 +339,11 @@ struct clk __init *ti_clk_register_clk(struct ti_clk *setup)
if (!IS_ERR(clk)) { if (!IS_ERR(clk)) {
setup->clk = clk; setup->clk = clk;
if (setup->clkdm_name) { if (setup->clkdm_name) {
if (__clk_get_flags(clk) & CLK_IS_BASIC) { clk_hw = __clk_get_hw(clk);
if (clk_hw_get_flags(clk_hw) & CLK_IS_BASIC) {
pr_warn("can't setup clkdm for basic clk %s\n", pr_warn("can't setup clkdm for basic clk %s\n",
setup->name); setup->name);
} else { } else {
clk_hw = __clk_get_hw(clk);
to_clk_hw_omap(clk_hw)->clkdm_name = to_clk_hw_omap(clk_hw)->clkdm_name =
setup->clkdm_name; setup->clkdm_name;
omap2_init_clk_clkdm(clk_hw); omap2_init_clk_clkdm(clk_hw);
......
...@@ -120,12 +120,12 @@ static void __init of_ti_clockdomain_setup(struct device_node *node) ...@@ -120,12 +120,12 @@ static void __init of_ti_clockdomain_setup(struct device_node *node)
__func__, node->full_name, i, PTR_ERR(clk)); __func__, node->full_name, i, PTR_ERR(clk));
continue; continue;
} }
if (__clk_get_flags(clk) & CLK_IS_BASIC) { clk_hw = __clk_get_hw(clk);
if (clk_hw_get_flags(clk_hw) & CLK_IS_BASIC) {
pr_warn("can't setup clkdm for basic clk %s\n", pr_warn("can't setup clkdm for basic clk %s\n",
__clk_get_name(clk)); __clk_get_name(clk));
continue; continue;
} }
clk_hw = __clk_get_hw(clk);
to_clk_hw_omap(clk_hw)->clkdm_name = clkdm_name; to_clk_hw_omap(clk_hw)->clkdm_name = clkdm_name;
omap2_init_clk_clkdm(clk_hw); omap2_init_clk_clkdm(clk_hw);
} }
......
...@@ -155,7 +155,7 @@ static int ti_clk_divider_bestdiv(struct clk_hw *hw, unsigned long rate, ...@@ -155,7 +155,7 @@ static int ti_clk_divider_bestdiv(struct clk_hw *hw, unsigned long rate,
maxdiv = _get_maxdiv(divider); maxdiv = _get_maxdiv(divider);
if (!(__clk_get_flags(hw->clk) & CLK_SET_RATE_PARENT)) { if (!(clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT)) {
parent_rate = *best_parent_rate; parent_rate = *best_parent_rate;
bestdiv = DIV_ROUND_UP(parent_rate, rate); bestdiv = DIV_ROUND_UP(parent_rate, rate);
bestdiv = bestdiv == 0 ? 1 : bestdiv; bestdiv = bestdiv == 0 ? 1 : bestdiv;
......
...@@ -163,7 +163,7 @@ static void __init _register_dpll(struct clk_hw *hw, ...@@ -163,7 +163,7 @@ static void __init _register_dpll(struct clk_hw *hw,
clk = clk_register(NULL, &clk_hw->hw); clk = clk_register(NULL, &clk_hw->hw);
if (!IS_ERR(clk)) { if (!IS_ERR(clk)) {
omap2_init_clk_hw_omap_clocks(clk); omap2_init_clk_hw_omap_clocks(&clk_hw->hw);
of_clk_add_provider(node, of_clk_src_simple_get, clk); of_clk_add_provider(node, of_clk_src_simple_get, clk);
kfree(clk_hw->hw.init->parent_names); kfree(clk_hw->hw.init->parent_names);
kfree(clk_hw->hw.init); kfree(clk_hw->hw.init);
...@@ -320,7 +320,7 @@ static void _register_dpll_x2(struct device_node *node, ...@@ -320,7 +320,7 @@ static void _register_dpll_x2(struct device_node *node,
if (IS_ERR(clk)) { if (IS_ERR(clk)) {
kfree(clk_hw); kfree(clk_hw);
} else { } else {
omap2_init_clk_hw_omap_clocks(clk); omap2_init_clk_hw_omap_clocks(&clk_hw->hw);
of_clk_add_provider(node, of_clk_src_simple_get, clk); of_clk_add_provider(node, of_clk_src_simple_get, clk);
} }
} }
......
...@@ -711,7 +711,7 @@ static struct clk_hw_omap *omap3_find_clkoutx2_dpll(struct clk_hw *hw) ...@@ -711,7 +711,7 @@ static struct clk_hw_omap *omap3_find_clkoutx2_dpll(struct clk_hw *hw)
do { do {
parent = __clk_get_parent(hw->clk); parent = __clk_get_parent(hw->clk);
hw = __clk_get_hw(parent); hw = __clk_get_hw(parent);
} while (hw && (__clk_get_flags(hw->clk) & CLK_IS_BASIC)); } while (hw && (clk_hw_get_flags(hw) & CLK_IS_BASIC));
if (!hw) if (!hw)
break; break;
pclk = to_clk_hw_omap(hw); pclk = to_clk_hw_omap(hw);
......
...@@ -63,7 +63,7 @@ static struct clk *_register_interface(struct device *dev, const char *name, ...@@ -63,7 +63,7 @@ static struct clk *_register_interface(struct device *dev, const char *name,
if (IS_ERR(clk)) if (IS_ERR(clk))
kfree(clk_hw); kfree(clk_hw);
else else
omap2_init_clk_hw_omap_clocks(clk); omap2_init_clk_hw_omap_clocks(&clk_hw->hw);
return clk; return clk;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment