From b33e5ba246860cc3fa6b79ed82d51c47f936f651 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 13 Mar 2014 09:19:36 +0100 Subject: clk: clk-mux: pass clk flags from initializers struct clk has a flags field, let the clk-mux initializers set this field. Signed-off-by: Sascha Hauer --- arch/arm/mach-clps711x/clock.c | 4 ++-- arch/arm/mach-imx/clk.h | 2 +- drivers/clk/clk-mux.c | 8 +++++--- drivers/clk/mxs/clk.h | 2 +- drivers/clk/tegra/clk-periph.c | 2 +- include/linux/clk.h | 6 ++++-- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/arch/arm/mach-clps711x/clock.c b/arch/arm/mach-clps711x/clock.c index 7658c9aa7c..548b333b11 100644 --- a/arch/arm/mach-clps711x/clock.c +++ b/arch/arm/mach-clps711x/clock.c @@ -95,9 +95,9 @@ static __init int clps711x_clk_init(void) clks[timer_hf].clk = clk_fixed(clks[timer_hf].name, f_timer_hf); clks[timer_lf].clk = clk_fixed(clks[timer_lf].name, f_timer_lf); clks[tc1].clk = clk_mux(clks[tc1].name, IOMEM(SYSCON1), 5, 1, - tc_sel_clks, ARRAY_SIZE(tc_sel_clks)); + tc_sel_clks, ARRAY_SIZE(tc_sel_clks), 0); clks[tc2].clk = clk_mux(clks[tc2].name, IOMEM(SYSCON1), 7, 1, - tc_sel_clks, ARRAY_SIZE(tc_sel_clks)); + tc_sel_clks, ARRAY_SIZE(tc_sel_clks), 0); clps711x_clk_register(dummy); clps711x_clk_register(cpu); diff --git a/arch/arm/mach-imx/clk.h b/arch/arm/mach-imx/clk.h index 4a7298d846..8e218fb57c 100644 --- a/arch/arm/mach-imx/clk.h +++ b/arch/arm/mach-imx/clk.h @@ -16,7 +16,7 @@ static inline struct clk *imx_clk_fixed_factor(const char *name, static inline struct clk *imx_clk_mux(const char *name, void __iomem *reg, u8 shift, u8 width, const char **parents, u8 num_parents) { - return clk_mux(name, reg, shift, width, parents, num_parents); + return clk_mux(name, reg, shift, width, parents, num_parents, 0); } static inline struct clk *imx_clk_gate(const char *name, const char *parent, diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c index b22bdd1ec7..9dcd39c2b9 100644 --- a/drivers/clk/clk-mux.c +++ b/drivers/clk/clk-mux.c @@ -56,7 +56,8 @@ static struct clk_ops clk_mux_ops = { }; struct clk *clk_mux_alloc(const char *name, void __iomem *reg, - u8 shift, u8 width, const char **parents, u8 num_parents) + u8 shift, u8 width, const char **parents, u8 num_parents, + unsigned flags) { struct clk_mux *m = xzalloc(sizeof(*m)); @@ -65,6 +66,7 @@ struct clk *clk_mux_alloc(const char *name, void __iomem *reg, m->width = width; m->clk.ops = &clk_mux_ops; m->clk.name = name; + m->clk.flags = flags; m->clk.parent_names = parents; m->clk.num_parents = num_parents; @@ -79,12 +81,12 @@ void clk_mux_free(struct clk *clk_mux) } struct clk *clk_mux(const char *name, void __iomem *reg, - u8 shift, u8 width, const char **parents, u8 num_parents) + u8 shift, u8 width, const char **parents, u8 num_parents, unsigned flags) { struct clk *m; int ret; - m = clk_mux_alloc(name, reg, shift, width, parents, num_parents); + m = clk_mux_alloc(name, reg, shift, width, parents, num_parents, flags); ret = clk_register(m); if (ret) { diff --git a/drivers/clk/mxs/clk.h b/drivers/clk/mxs/clk.h index b4fcfa0090..3db38b4913 100644 --- a/drivers/clk/mxs/clk.h +++ b/drivers/clk/mxs/clk.h @@ -40,7 +40,7 @@ static inline struct clk *mxs_clk_gate(const char *name, static inline struct clk *mxs_clk_mux(const char *name, void __iomem *reg, u8 shift, u8 width, const char **parent_names, int num_parents) { - return clk_mux(name, reg, shift, width, parent_names, num_parents); + return clk_mux(name, reg, shift, width, parent_names, num_parents, 0); } static inline struct clk *mxs_clk_fixed_factor(const char *name, diff --git a/drivers/clk/tegra/clk-periph.c b/drivers/clk/tegra/clk-periph.c index e969495875..0b9c8dce18 100644 --- a/drivers/clk/tegra/clk-periph.c +++ b/drivers/clk/tegra/clk-periph.c @@ -140,7 +140,7 @@ struct clk *_tegra_clk_register_periph(const char *name, } periph->mux = clk_mux_alloc(NULL, clk_base + reg_offset, 30, 2, - parent_names, num_parents); + parent_names, num_parents, 0); if (!periph->mux) goto out_mux; diff --git a/include/linux/clk.h b/include/linux/clk.h index af38c720e8..439e88cf5b 100644 --- a/include/linux/clk.h +++ b/include/linux/clk.h @@ -252,10 +252,12 @@ struct clk *clk_fixed_factor(const char *name, const char *parent, unsigned int mult, unsigned int div); struct clk *clk_mux_alloc(const char *name, void __iomem *reg, - u8 shift, u8 width, const char **parents, u8 num_parents); + u8 shift, u8 width, const char **parents, u8 num_parents, + unsigned flags); void clk_mux_free(struct clk *clk_mux); struct clk *clk_mux(const char *name, void __iomem *reg, - u8 shift, u8 width, const char **parents, u8 num_parents); + u8 shift, u8 width, const char **parents, u8 num_parents, + unsigned flags); struct clk *clk_gate_alloc(const char *name, const char *parent, void __iomem *reg, u8 shift); -- cgit v1.2.3