summaryrefslogtreecommitdiff
path: root/drivers/clk/ti
diff options
context:
space:
mode:
authorMike Turquette <mturquette@linaro.org>2014-07-26 02:37:40 +0400
committerMike Turquette <mturquette@linaro.org>2014-07-26 02:37:40 +0400
commit07761baff028927824292930c181339a53cfbd77 (patch)
tree0083164b00bfe3dadf26c7a0a285f98f8f08802a /drivers/clk/ti
parent86be408bfbd846fab3c4ac21d6f9298bd2e4b790 (diff)
parent94e72ae5dbb1aff59791e6f96e2f0416b8a82257 (diff)
downloadlinux-07761baff028927824292930c181339a53cfbd77.tar.xz
Merge branch 'for-v3.17/ti-clk-driver' of github.com:t-kristo/linux-pm into clk-next-ti
Diffstat (limited to 'drivers/clk/ti')
-rw-r--r--drivers/clk/ti/clk-7xx.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/clk/ti/clk-7xx.c b/drivers/clk/ti/clk-7xx.c
index e1581335937d..09dbe38e183d 100644
--- a/drivers/clk/ti/clk-7xx.c
+++ b/drivers/clk/ti/clk-7xx.c
@@ -18,6 +18,7 @@
#define DRA7_DPLL_ABE_DEFFREQ 361267200
#define DRA7_DPLL_GMAC_DEFFREQ 1000000000
+#define DRA7_DPLL_USB_DEFFREQ 960000000
static struct ti_dt_clk dra7xx_clks[] = {
@@ -327,5 +328,15 @@ int __init dra7xx_dt_clk_init(void)
if (rc)
pr_err("%s: failed to configure GMAC DPLL!\n", __func__);
+ dpll_ck = clk_get_sys(NULL, "dpll_usb_ck");
+ rc = clk_set_rate(dpll_ck, DRA7_DPLL_USB_DEFFREQ);
+ if (rc)
+ pr_err("%s: failed to configure USB DPLL!\n", __func__);
+
+ dpll_ck = clk_get_sys(NULL, "dpll_usb_m2_ck");
+ rc = clk_set_rate(dpll_ck, DRA7_DPLL_USB_DEFFREQ/2);
+ if (rc)
+ pr_err("%s: failed to set USB_DPLL M2 OUT\n", __func__);
+
return rc;
}