diff options
| author |   Tero Kristo <t-kristo@ti.com> | 2017-02-09 11:25:28 +0200 |
|---|---|---|
| committer | Tero Kristo <t-kristo@ti.com> | 2017-03-08 13:05:42 +0200 |
| commit | 473adbf4e02857a6b78dfb3d9fcf752638bbadb9 (patch) | |
| tree | 2bedaf64bf3a3a5f0d5352ff75712b5c8a338da1 /drivers/clk/ti | |
| parent | clk: ti: gate: export gate_clk_ops locally (diff) | |
| download | linux-dev-473adbf4e02857a6b78dfb3d9fcf752638bbadb9.tar.xz linux-dev-473adbf4e02857a6b78dfb3d9fcf752638bbadb9.zip | |
clk: ti: dpll44xx: fix clksel register initialization
clksel register pointer should be used for the DPLL-MX autoidle handling.
Currently this is not setup at all. Fix by adding proper handling for the
register.
Signed-off-by: Tero Kristo <t-kristo@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'drivers/clk/ti')
| -rw-r--r-- | drivers/clk/ti/dpll.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/clk/ti/dpll.c b/drivers/clk/ti/dpll.c index c149bd169f43..778bc90955b9 100644 --- a/drivers/clk/ti/dpll.c +++ b/drivers/clk/ti/dpll.c @@ -319,6 +319,7 @@ static void _register_dpll_x2(struct device_node *node, struct clk_hw_omap *clk_hw; const char *name = node->name; const char *parent_name; + int ret; parent_name = of_clk_get_parent_name(node, 0); if (!parent_name) { @@ -338,6 +339,20 @@ static void _register_dpll_x2(struct device_node *node, init.parent_names = &parent_name; init.num_parents = 1; + if (hw_ops == &clkhwops_omap4_dpllmx) { + /* Check if register defined, if not, drop hw-ops */ + ret = of_property_count_elems_of_size(node, "reg", 1); + if (ret <= 0) { + hw_ops = NULL; + } else { + clk_hw->clksel_reg = ti_clk_get_reg_addr(node, 0); + if (IS_ERR(clk_hw->clksel_reg)) { + kfree(clk_hw); + return; + } + } + } + /* register the clock */ clk = ti_clk_register(NULL, &clk_hw->hw, name); |