diff options
| author | Tero Kristo <t-kristo@ti.com> | 2016-09-29 12:06:40 +0300 |
|---|---|---|
| committer | Tero Kristo <t-kristo@ti.com> | 2017-03-08 13:58:18 +0300 |
| commit | 1ae79c46cf195ea39407bd5a2b234304d537980f (patch) | |
| tree | c54b41385bc0fcd1faf55a98851ac765bf65cf9e /drivers/clk/ti/composite.c | |
| parent | c17435c56bb1feb7365ebffcfbe98baae50a0fb4 (diff) | |
| download | linux-1ae79c46cf195ea39407bd5a2b234304d537980f.tar.xz | |
clk: ti: use automatic clock alias generation framework
Generate clock aliases automatically for all TI clock drivers.
Signed-off-by: Tero Kristo <t-kristo@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'drivers/clk/ti/composite.c')
| -rw-r--r-- | drivers/clk/ti/composite.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/drivers/clk/ti/composite.c b/drivers/clk/ti/composite.c index 1cf70f452e1e..3f60f990cad8 100644 --- a/drivers/clk/ti/composite.c +++ b/drivers/clk/ti/composite.c @@ -126,6 +126,7 @@ struct clk *ti_clk_register_composite(struct ti_clk *setup) int num_parents = 1; const char **parent_names = NULL; struct clk *clk; + int ret; comp = setup->data; @@ -150,6 +151,12 @@ struct clk *ti_clk_register_composite(struct ti_clk *setup) &ti_composite_divider_ops, gate, &ti_composite_gate_ops, 0); + ret = ti_clk_add_alias(NULL, clk, setup->name); + if (ret) { + clk_unregister(clk); + return ERR_PTR(ret); + } + return clk; } #endif @@ -163,6 +170,7 @@ static void __init _register_composite(struct clk_hw *hw, int num_parents = 0; const char **parent_names = NULL; int i; + int ret; /* Check for presence of each component clock */ for (i = 0; i < CLK_COMPONENT_TYPE_MAX; i++) { @@ -217,8 +225,14 @@ static void __init _register_composite(struct clk_hw *hw, _get_hw(cclk, CLK_COMPONENT_TYPE_GATE), &ti_composite_gate_ops, 0); - if (!IS_ERR(clk)) + if (!IS_ERR(clk)) { + ret = ti_clk_add_alias(NULL, clk, node->name); + if (ret) { + clk_unregister(clk); + goto cleanup; + } of_clk_add_provider(node, of_clk_src_simple_get, clk); + } cleanup: /* Free component clock list entries */ |