summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-03-13 09:41:28 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2014-03-28 21:03:14 +0100
commit82163afcf0feb35f88a08362b27ed3e18c5072d1 (patch)
treec30ded395b17a8d3da61c4631bd4fe16f988a3c3 /drivers
parentf4c753651406821cb65799b315df86ef22a5c05f (diff)
downloadbarebox-82163afcf0feb35f88a08362b27ed3e18c5072d1.tar.gz
barebox-82163afcf0feb35f88a08362b27ed3e18c5072d1.tar.xz
clk: clk-fixed-factor: pass flags to initializers
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/clk/clk-fixed-factor.c3
-rw-r--r--drivers/clk/mvebu/common.c2
-rw-r--r--drivers/clk/mxs/clk.h2
-rw-r--r--drivers/clk/tegra/clk-tegra20.c2
4 files changed, 5 insertions, 4 deletions
diff --git a/drivers/clk/clk-fixed-factor.c b/drivers/clk/clk-fixed-factor.c
index f0ecbd3e59..df0d2f345c 100644
--- a/drivers/clk/clk-fixed-factor.c
+++ b/drivers/clk/clk-fixed-factor.c
@@ -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;
diff --git a/drivers/clk/mvebu/common.c b/drivers/clk/mvebu/common.c
index aa1e8f697a..658ce3e81a 100644
--- a/drivers/clk/mvebu/common.c
+++ b/drivers/clk/mvebu/common.c
@@ -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]));
};
diff --git a/drivers/clk/mxs/clk.h b/drivers/clk/mxs/clk.h
index 168fa58239..7bab7b5e6e 100644
--- a/drivers/clk/mxs/clk.h
+++ b/drivers/clk/mxs/clk.h
@@ -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 */
diff --git a/drivers/clk/tegra/clk-tegra20.c b/drivers/clk/tegra/clk-tegra20.c
index f68c811a8d..cfb719f431 100644
--- a/drivers/clk/tegra/clk-tegra20.c
+++ b/drivers/clk/tegra/clk-tegra20.c
@@ -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 */