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-impd1.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-impd1.c')
| -rw-r--r-- | drivers/clk/versatile/clk-impd1.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/clk/versatile/clk-impd1.c b/drivers/clk/versatile/clk-impd1.c index 844f8d711a12..6d8b8e1a080a 100644 --- a/drivers/clk/versatile/clk-impd1.c +++ b/drivers/clk/versatile/clk-impd1.c @@ -93,13 +93,15 @@ void integrator_impd1_clk_init(void __iomem *base, unsigned int id) imc = &impd1_clks[id]; imc->vco1name = kasprintf(GFP_KERNEL, "lm%x-vco1", id); - clk = icst_clk_register(NULL, &impd1_icst1_desc, imc->vco1name, base); + clk = icst_clk_register(NULL, &impd1_icst1_desc, imc->vco1name, NULL, + base); imc->vco1clk = clk; imc->clks[0] = clkdev_alloc(clk, NULL, "lm%x:01000", id); /* VCO2 is also called "CLK2" */ imc->vco2name = kasprintf(GFP_KERNEL, "lm%x-vco2", id); - clk = icst_clk_register(NULL, &impd1_icst2_desc, imc->vco2name, base); + clk = icst_clk_register(NULL, &impd1_icst2_desc, imc->vco2name, NULL, + base); imc->vco2clk = clk; /* MMCI uses CLK2 right off */ |