Allows to reuse clk mux code within other clocks.
Signed-off-by: Lucas Stach <[email protected]>
---
drivers/clk/clk-mux.c | 29 ++++++++++++++++++++++++-----
include/linux/clk.h | 4 ++++
2 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c
index cb5f1a1..47efe12 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;
}
diff --git a/include/linux/clk.h b/include/linux/clk.h
index cf41bd7..d5e5b6b 100644
--- a/include/linux/clk.h
+++ b/include/linux/clk.h
@@ -197,6 +197,10 @@ struct clk *clk_divider_table(const char *name,
const struct clk_div_table *table);
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);
+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);
--
1.8.2.1
_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
