diff options
author | Lucas Stach <dev@lynxeye.de> | 2013-06-30 23:08:46 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-07-02 08:36:09 +0200 |
commit | 10a06ed554cc6599b862e49885d731a6cee69b8d (patch) | |
tree | 91a7e6226b74b34fa1ccf7bdf443e4e7c2827103 /drivers/clk/clk-mux.c | |
parent | 98a2fe8f95847f84b37616762aa0bf43c0e1f015 (diff) | |
download | barebox-10a06ed554cc6599b862e49885d731a6cee69b8d.tar.gz barebox-10a06ed554cc6599b862e49885d731a6cee69b8d.tar.xz |
clk: allow to instanciate clk mux without registering it
Allows to reuse clk mux code within other clocks.
Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/clk/clk-mux.c')
-rw-r--r-- | drivers/clk/clk-mux.c | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c index cb5f1a1a7b..47efe1273a 100644 --- a/drivers/clk/clk-mux.c +++ b/drivers/clk/clk-mux.c @@ -27,6 +27,8 @@ struct clk_mux { int width; }; +#define to_clk_mux(_clk) container_of(_clk, struct clk_mux, clk) + static int clk_mux_get_parent(struct clk *clk) { struct clk_mux *m = container_of(clk, struct clk_mux, clk); @@ -53,11 +55,10 @@ struct clk_ops clk_mux_ops = { .set_parent = clk_mux_set_parent, }; -struct clk *clk_mux(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) { struct clk_mux *m = xzalloc(sizeof(*m)); - int ret; m->reg = reg; m->shift = shift; @@ -67,11 +68,29 @@ struct clk *clk_mux(const char *name, void __iomem *reg, m->clk.parent_names = parents; m->clk.num_parents = num_parents; - ret = clk_register(&m->clk); + return &m->clk; +} + +void clk_mux_free(struct clk *clk_mux) +{ + struct clk_mux *m = to_clk_mux(clk_mux); + + free(m); +} + +struct clk *clk_mux(const char *name, void __iomem *reg, + u8 shift, u8 width, const char **parents, u8 num_parents) +{ + struct clk *m; + int ret; + + m = clk_mux_alloc(name, reg, shift, width, parents, num_parents); + + ret = clk_register(m); if (ret) { - free(m); + free(to_clk_mux(m)); return ERR_PTR(ret); } - return &m->clk; + return m; } |