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 <s.hauer@pengutronix.de>
This commit is contained in:
parent
3d937ce312
commit
b33e5ba246
|
@ -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_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[timer_lf].clk = clk_fixed(clks[timer_lf].name, f_timer_lf);
|
||||||
clks[tc1].clk = clk_mux(clks[tc1].name, IOMEM(SYSCON1), 5, 1,
|
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,
|
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(dummy);
|
||||||
clps711x_clk_register(cpu);
|
clps711x_clk_register(cpu);
|
||||||
|
|
|
@ -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,
|
static inline struct clk *imx_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)
|
||||||
{
|
{
|
||||||
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,
|
static inline struct clk *imx_clk_gate(const char *name, const char *parent,
|
||||||
|
|
|
@ -56,7 +56,8 @@ static struct clk_ops clk_mux_ops = {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct clk *clk_mux_alloc(const char *name, void __iomem *reg,
|
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));
|
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->width = width;
|
||||||
m->clk.ops = &clk_mux_ops;
|
m->clk.ops = &clk_mux_ops;
|
||||||
m->clk.name = name;
|
m->clk.name = name;
|
||||||
|
m->clk.flags = flags;
|
||||||
m->clk.parent_names = parents;
|
m->clk.parent_names = parents;
|
||||||
m->clk.num_parents = num_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,
|
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;
|
struct clk *m;
|
||||||
int ret;
|
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);
|
ret = clk_register(m);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
|
|
|
@ -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,
|
static inline struct clk *mxs_clk_mux(const char *name, void __iomem *reg,
|
||||||
u8 shift, u8 width, const char **parent_names, int num_parents)
|
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,
|
static inline struct clk *mxs_clk_fixed_factor(const char *name,
|
||||||
|
|
|
@ -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,
|
periph->mux = clk_mux_alloc(NULL, clk_base + reg_offset, 30, 2,
|
||||||
parent_names, num_parents);
|
parent_names, num_parents, 0);
|
||||||
if (!periph->mux)
|
if (!periph->mux)
|
||||||
goto out_mux;
|
goto out_mux;
|
||||||
|
|
||||||
|
|
|
@ -252,10 +252,12 @@ 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);
|
||||||
|
|
||||||
struct clk *clk_mux_alloc(const char *name, void __iomem *reg,
|
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);
|
void clk_mux_free(struct clk *clk_mux);
|
||||||
struct clk *clk_mux(const char *name, void __iomem *reg,
|
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,
|
struct clk *clk_gate_alloc(const char *name, const char *parent,
|
||||||
void __iomem *reg, u8 shift);
|
void __iomem *reg, u8 shift);
|
||||||
|
|
Loading…
Reference in New Issue