aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/clk/socfpga/clk-periph-a10.c
diff options
context:
space:
mode:
authorDinh Nguyen <dinguyen@opensource.altera.com>2016-02-22 15:52:46 -0600
committerStephen Boyd <sboyd@codeaurora.org>2016-02-22 14:17:37 -0800
commit56713da3ee5c6b0cf5b1881973b939250766a91b (patch)
treef44bdc536676e9cc64934dda0076bd3197b8b4cf /drivers/clk/socfpga/clk-periph-a10.c
parentclk: ti: dpll: convert DPLL support code to use clk_hw instead of clk ptrs (diff)
downloadlinux-dev-56713da3ee5c6b0cf5b1881973b939250766a91b.tar.xz
linux-dev-56713da3ee5c6b0cf5b1881973b939250766a91b.zip
clk: socfpga: allow for multiple parents on Arria10 periph clocks
There are some Arria10 clocks of type "altr,socfpga-a10-perip-clk" that can have multiple parents. Fix up the __socfpga_periph_init() to call of_clk_parent_fill() that will return the appropriate number of parents. Also, update __socfpga_gate_init() to call of_clk_parent_fill() helper function. Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Diffstat (limited to 'drivers/clk/socfpga/clk-periph-a10.c')
-rw-r--r--drivers/clk/socfpga/clk-periph-a10.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/clk/socfpga/clk-periph-a10.c b/drivers/clk/socfpga/clk-periph-a10.c
index 1f397cb72e89..70993f1e88bc 100644
--- a/drivers/clk/socfpga/clk-periph-a10.c
+++ b/drivers/clk/socfpga/clk-periph-a10.c
@@ -74,7 +74,7 @@ static __init void __socfpga_periph_init(struct device_node *node,
struct clk *clk;
struct socfpga_periph_clk *periph_clk;
const char *clk_name = node->name;
- const char *parent_name;
+ const char *parent_name[SOCFPGA_MAX_PARENTS];
struct clk_init_data init;
int rc;
u32 fixed_div;
@@ -109,9 +109,8 @@ static __init void __socfpga_periph_init(struct device_node *node,
init.ops = ops;
init.flags = 0;
- parent_name = of_clk_get_parent_name(node, 0);
- init.num_parents = 1;
- init.parent_names = &parent_name;
+ init.num_parents = of_clk_parent_fill(node, parent_name, SOCFPGA_MAX_PARENTS);
+ init.parent_names = parent_name;
periph_clk->hw.hw.init = &init;