aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/clk/samsung/clk.c
diff options
context:
space:
mode:
authorHeiko Stuebner <heiko@sntech.de>2013-03-18 00:43:52 -0400
committerKukjin Kim <kgene.kim@samsung.com>2013-03-28 01:46:26 -0400
commit6e92bf5a01afb1f897aa15a34517da07d7c0c320 (patch)
treedd4a0da10e0538a037dd5e55533d666b2d8bd664 /drivers/clk/samsung/clk.c
parent2466196d3e4f1fbe902ca8480bf4a03db78572b2 (diff)
clk: samsung: always allocate the clk_table
This is needed to allow looking up previous created clocks when adding separate aliases to them. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Acked-by: Mike Turquette <mturquette@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'drivers/clk/samsung/clk.c')
-rw-r--r--drivers/clk/samsung/clk.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/clk/samsung/clk.c b/drivers/clk/samsung/clk.c
index ca04b9e61588..1ed571606395 100644
--- a/drivers/clk/samsung/clk.c
+++ b/drivers/clk/samsung/clk.c
@@ -76,14 +76,14 @@ void __init samsung_clk_init(struct device_node *np, void __iomem *base,
76 } 76 }
77#endif 77#endif
78 78
79 if (!np)
80 return;
81
82#ifdef CONFIG_OF
83 clk_table = kzalloc(sizeof(struct clk *) * nr_clks, GFP_KERNEL); 79 clk_table = kzalloc(sizeof(struct clk *) * nr_clks, GFP_KERNEL);
84 if (!clk_table) 80 if (!clk_table)
85 panic("could not allocate clock lookup table\n"); 81 panic("could not allocate clock lookup table\n");
86 82
83 if (!np)
84 return;
85
86#ifdef CONFIG_OF
87 clk_data.clks = clk_table; 87 clk_data.clks = clk_table;
88 clk_data.clk_num = nr_clks; 88 clk_data.clk_num = nr_clks;
89 of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data); 89 of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);