diff options
-rw-r--r-- | drivers/clk/ti/clk-7xx.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/drivers/clk/ti/clk-7xx.c b/drivers/clk/ti/clk-7xx.c index 9b5b289e6334..a911d7de3377 100644 --- a/drivers/clk/ti/clk-7xx.c +++ b/drivers/clk/ti/clk-7xx.c | |||
@@ -18,7 +18,6 @@ | |||
18 | 18 | ||
19 | #include "clock.h" | 19 | #include "clock.h" |
20 | 20 | ||
21 | #define DRA7_DPLL_ABE_DEFFREQ 180633600 | ||
22 | #define DRA7_DPLL_GMAC_DEFFREQ 1000000000 | 21 | #define DRA7_DPLL_GMAC_DEFFREQ 1000000000 |
23 | #define DRA7_DPLL_USB_DEFFREQ 960000000 | 22 | #define DRA7_DPLL_USB_DEFFREQ 960000000 |
24 | 23 | ||
@@ -313,27 +312,12 @@ static struct ti_dt_clk dra7xx_clks[] = { | |||
313 | int __init dra7xx_dt_clk_init(void) | 312 | int __init dra7xx_dt_clk_init(void) |
314 | { | 313 | { |
315 | int rc; | 314 | int rc; |
316 | struct clk *abe_dpll_mux, *sys_clkin2, *dpll_ck, *hdcp_ck; | 315 | struct clk *dpll_ck, *hdcp_ck; |
317 | 316 | ||
318 | ti_dt_clocks_register(dra7xx_clks); | 317 | ti_dt_clocks_register(dra7xx_clks); |
319 | 318 | ||
320 | omap2_clk_disable_autoidle_all(); | 319 | omap2_clk_disable_autoidle_all(); |
321 | 320 | ||
322 | abe_dpll_mux = clk_get_sys(NULL, "abe_dpll_sys_clk_mux"); | ||
323 | sys_clkin2 = clk_get_sys(NULL, "sys_clkin2"); | ||
324 | dpll_ck = clk_get_sys(NULL, "dpll_abe_ck"); | ||
325 | |||
326 | rc = clk_set_parent(abe_dpll_mux, sys_clkin2); | ||
327 | if (!rc) | ||
328 | rc = clk_set_rate(dpll_ck, DRA7_DPLL_ABE_DEFFREQ); | ||
329 | if (rc) | ||
330 | pr_err("%s: failed to configure ABE DPLL!\n", __func__); | ||
331 | |||
332 | dpll_ck = clk_get_sys(NULL, "dpll_abe_m2x2_ck"); | ||
333 | rc = clk_set_rate(dpll_ck, DRA7_DPLL_ABE_DEFFREQ * 2); | ||
334 | if (rc) | ||
335 | pr_err("%s: failed to configure ABE DPLL m2x2!\n", __func__); | ||
336 | |||
337 | dpll_ck = clk_get_sys(NULL, "dpll_gmac_ck"); | 321 | dpll_ck = clk_get_sys(NULL, "dpll_gmac_ck"); |
338 | rc = clk_set_rate(dpll_ck, DRA7_DPLL_GMAC_DEFFREQ); | 322 | rc = clk_set_rate(dpll_ck, DRA7_DPLL_GMAC_DEFFREQ); |
339 | if (rc) | 323 | if (rc) |