diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2014-01-20 21:31:41 +0100 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2014-02-13 11:20:48 +0100 |
commit | bf6edb4bb1fabd73bebcd0ae85cdeb14c5893f3b (patch) | |
tree | c6abfe8226ced0b44e3b57ba952be8888faaea41 /drivers/clk/versatile/clk-integrator.c | |
parent | ARM: integrator: switch to fetch clocks from device tree (diff) | |
download | linux-bf6edb4bb1fabd73bebcd0ae85cdeb14c5893f3b.tar.xz linux-bf6edb4bb1fabd73bebcd0ae85cdeb14c5893f3b.zip |
clk: versatile: pass a parent to the ICST clock
As we want to actually define the parent frequency in the device
tree for the ICST clocks, modify the clock registration function
to take a parent argument.
Cc: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/clk/versatile/clk-integrator.c')
-rw-r--r-- | drivers/clk/versatile/clk-integrator.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/clk/versatile/clk-integrator.c b/drivers/clk/versatile/clk-integrator.c index 19864b5690e9..5d36a719fefb 100644 --- a/drivers/clk/versatile/clk-integrator.c +++ b/drivers/clk/versatile/clk-integrator.c @@ -43,6 +43,7 @@ static void __init of_integrator_cm_osc_setup(struct device_node *np) struct clk *clk = ERR_PTR(-EINVAL); const char *clk_name = np->name; const struct clk_icst_desc *desc = &cm_auxosc_desc; + const char *parent_name; if (!cm_base) { /* Remap the core module base if not done yet */ @@ -60,7 +61,8 @@ static void __init of_integrator_cm_osc_setup(struct device_node *np) } } - clk = icst_clk_register(NULL, desc, clk_name, cm_base); + parent_name = of_clk_get_parent_name(np, 0); + clk = icst_clk_register(NULL, desc, clk_name, parent_name, cm_base); if (!IS_ERR(clk)) of_clk_add_provider(np, of_clk_src_simple_get, clk); } |