9
0
Fork 0

clk: clk-fixed-factor: pass flags to initializers

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2014-03-13 09:41:28 +01:00
parent f4c7536514
commit 82163afcf0
6 changed files with 8 additions and 6 deletions

View File

@ -10,7 +10,7 @@ static inline struct clk *imx_clk_divider(const char *name, const char *parent,
static inline struct clk *imx_clk_fixed_factor(const char *name,
const char *parent, unsigned int mult, unsigned int div)
{
return clk_fixed_factor(name, parent, mult, div);
return clk_fixed_factor(name, parent, mult, div, 0);
}
static inline struct clk *imx_clk_mux(const char *name, void __iomem *reg,

View File

@ -40,7 +40,7 @@ static struct clk_ops clk_fixed_factor_ops = {
};
struct clk *clk_fixed_factor(const char *name,
const char *parent, unsigned int mult, unsigned int div)
const char *parent, unsigned int mult, unsigned int div, unsigned flags)
{
struct clk_fixed_factor *f = xzalloc(sizeof(*f));
int ret;
@ -50,6 +50,7 @@ struct clk *clk_fixed_factor(const char *name,
f->parent = parent;
f->clk.ops = &clk_fixed_factor_ops;
f->clk.name = name;
f->clk.flags = flags;
f->clk.parent_names = &f->parent;
f->clk.num_parents = 1;

View File

@ -87,7 +87,7 @@ int mvebu_coreclk_probe(struct device_d *dev)
2+n, &rclk_name);
desc->get_clk_ratio(base, desc->ratios[n].id, &mult, &div);
clk_data.clks[2+n] = clk_fixed_factor(rclk_name, cpuclk_name,
mult, div);
mult, div, 0);
WARN_ON(IS_ERR(clk_data.clks[2+n]));
};

View File

@ -46,7 +46,7 @@ static inline struct clk *mxs_clk_mux(const char *name, void __iomem *reg,
static inline struct clk *mxs_clk_fixed_factor(const char *name,
const char *parent_name, unsigned int mult, unsigned int div)
{
return clk_fixed_factor(name, parent_name, mult, div);
return clk_fixed_factor(name, parent_name, mult, div, 0);
}
#endif /* __MXS_CLK_H */

View File

@ -62,7 +62,7 @@ static void tegra20_osc_clk_init(void)
clks[clk_32k] = clk_fixed("clk_32k", 32768);
clks[pll_ref] = clk_fixed_factor("pll_ref", "clk_m", 1,
get_pll_ref_div());
get_pll_ref_div(), 0);
}
/* PLL frequency tables */

View File

@ -249,7 +249,8 @@ struct clk *clk_divider_table(const char *name,
const char *parent, void __iomem *reg, u8 shift, u8 width,
const struct clk_div_table *table);
struct clk *clk_fixed_factor(const char *name,
const char *parent, unsigned int mult, unsigned int div);
const char *parent, unsigned int mult, unsigned int div,
unsigned flags);
struct clk *clk_mux_alloc(const char *name, void __iomem *reg,
u8 shift, u8 width, const char **parents, u8 num_parents,