diff options
| author | Michael Turquette <mturquette@baylibre.com> | 2015-12-22 21:34:10 +0300 |
|---|---|---|
| committer | Michael Turquette <mturquette@baylibre.com> | 2015-12-22 22:57:35 +0300 |
| commit | b8f15e711904712e71d2aac3241f9669d0b62917 (patch) | |
| tree | e44d2f1b0fdf7068df8d52318c1e74f7e3020468 /drivers/clk/imx/clk-imx7d.c | |
| parent | 4ef7675344d687a0ef5b0d7c0cee12da005870c0 (diff) | |
| parent | fcd5ac1a4137aea367f6a41399a15e7cef1c0841 (diff) | |
| download | linux-b8f15e711904712e71d2aac3241f9669d0b62917.tar.xz | |
Merge commit 'fe5fa8fbd4d47f40a45fa29ee1abdb10cb061ec2' into clk-next
Diffstat (limited to 'drivers/clk/imx/clk-imx7d.c')
| -rw-r--r-- | drivers/clk/imx/clk-imx7d.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/clk/imx/clk-imx7d.c b/drivers/clk/imx/clk-imx7d.c index 448ef321948b..fbb6a8c8653d 100644 --- a/drivers/clk/imx/clk-imx7d.c +++ b/drivers/clk/imx/clk-imx7d.c @@ -833,10 +833,13 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node) clks[IMX7D_GPT_3M_CLK] = imx_clk_fixed_factor("gpt_3m", "osc", 1, 8); - for (i = 0; i < ARRAY_SIZE(clks); i++) - if (IS_ERR(clks[i])) - pr_err("i.MX7D clk %d: register failed with %ld\n", - i, PTR_ERR(clks[i])); + clks[IMX7D_CLK_ARM] = imx_clk_cpu("arm", "arm_a7_root_clk", + clks[IMX7D_ARM_A7_ROOT_CLK], + clks[IMX7D_ARM_A7_ROOT_SRC], + clks[IMX7D_PLL_ARM_MAIN_CLK], + clks[IMX7D_PLL_SYS_MAIN_CLK]); + + imx_check_clocks(clks, ARRAY_SIZE(clks)); clk_data.clks = clks; clk_data.clk_num = ARRAY_SIZE(clks); |