|
10 | 10 |
|
11 | 11 | #include <linux/clk.h>
|
12 | 12 | #include <linux/clk-provider.h>
|
13 |
| -#include <linux/clkdev.h> |
14 | 13 | #include <linux/clk/renesas.h>
|
15 | 14 | #include <linux/device.h>
|
16 | 15 | #include <linux/io.h>
|
|
19 | 18 | #include <linux/of_address.h>
|
20 | 19 | #include <linux/pm_clock.h>
|
21 | 20 | #include <linux/pm_domain.h>
|
| 21 | +#include <linux/slab.h> |
22 | 22 | #include <linux/spinlock.h>
|
23 | 23 |
|
24 | 24 | /*
|
@@ -237,22 +237,12 @@ static void __init cpg_mstp_clocks_init(struct device_node *np)
|
237 | 237 |
|
238 | 238 | clks[clkidx] = cpg_mstp_clock_register(name, parent_name,
|
239 | 239 | clkidx, group);
|
240 |
| - if (!IS_ERR(clks[clkidx])) { |
| 240 | + if (!IS_ERR(clks[clkidx])) |
241 | 241 | group->data.clk_num = max(group->data.clk_num,
|
242 | 242 | clkidx + 1);
|
243 |
| - /* |
244 |
| - * Register a clkdev to let board code retrieve the |
245 |
| - * clock by name and register aliases for non-DT |
246 |
| - * devices. |
247 |
| - * |
248 |
| - * FIXME: Remove this when all devices that require a |
249 |
| - * clock will be instantiated from DT. |
250 |
| - */ |
251 |
| - clk_register_clkdev(clks[clkidx], name, NULL); |
252 |
| - } else { |
| 243 | + else |
253 | 244 | pr_err("%s: failed to register %pOFn %s clock (%ld)\n",
|
254 | 245 | __func__, np, name, PTR_ERR(clks[clkidx]));
|
255 |
| - } |
256 | 246 | }
|
257 | 247 |
|
258 | 248 | of_clk_add_provider(np, of_clk_src_onecell_get, &group->data);
|
|
0 commit comments