mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

clk: ti: dpll44xx: fix clksel register initialization

Browse source 
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>
This commit is contained in:
Tero Kristo 2017-02-09 11:25:28 +02:00
parent 9a00fa6843
commit 473adbf4e0
1 changed files with 15 additions and 0 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/clk/ti/dpll.c
View file

@ -319,6 +319,7 @@ static void _register_dpll_x2(struct device_node *node,
struct clk_hw_omap *clk_hw; struct clk_hw_omap *clk_hw;
const char *name = node->name; const char *name = node->name;
const char *parent_name; const char *parent_name;
int ret;
parent_name = of_clk_get_parent_name(node, 0); parent_name = of_clk_get_parent_name(node, 0);
if (!parent_name) { if (!parent_name) {
@ -338,6 +339,20 @@ static void _register_dpll_x2(struct device_node *node,
init.parent_names = &parent_name; init.parent_names = &parent_name;
init.num_parents = 1; 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 */ /* register the clock */
clk = ti_clk_register(NULL, &clk_hw->hw, name); clk = ti_clk_register(NULL, &clk_hw->hw, name);