Message ID | 51EFE1D4.8090307@ti.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 07/24/2013 05:16 PM, Roger Quadros wrote: > On 07/23/2013 10:19 AM, Tero Kristo wrote: >> Hi, >> >> Changes compared to previous version: >> >> - Clock init files moved from mach-omap2/ to drivers/clk/omap/ >> - AM33xx support added [patches 15-20] >> - OMAP3 support added [patches 21-29] >> - DRA7 APLL support added (thanks Keerthy) [patches 30-33] >> >> Test branch on top of 3.11-rc1 available here: >> >> git://gitorious.org/~kristo/omap-pm/omap-pm-work.git >> branch: mainline-3.11-rc1-omap-dt-clks >> >> Testing done: >> >> - boot + suspend tested on OMAP3 beagle C4 (omap3530) >> - boot + suspend tested on OMAP4 panda ES (omap4460) >> - boot tested on beagle bone (am335x) >> >> A boot test was also executed for DRA7 and OMAP5 on a separate branch >> (mainline does not have OMAP5 / DRA7 support so far.) > > Thanks to your hints, I was able to get this to work with 3.11-rc1 on omap5 uevm > using the following 3 patches. Please include them in your series. Thanks. Your patches don't apply cleanly to mainline currently, as the omap5 base support is still not merged. I deliberately left out the full omap5 integration because of that. Lets see how and when the integration proceeds, but I can track your patches meanwhile. -Tero
On 07/24/2013 05:29 PM, Tero Kristo wrote: > On 07/24/2013 05:16 PM, Roger Quadros wrote: >> On 07/23/2013 10:19 AM, Tero Kristo wrote: >>> Hi, >>> >>> Changes compared to previous version: >>> >>> - Clock init files moved from mach-omap2/ to drivers/clk/omap/ >>> - AM33xx support added [patches 15-20] >>> - OMAP3 support added [patches 21-29] >>> - DRA7 APLL support added (thanks Keerthy) [patches 30-33] >>> >>> Test branch on top of 3.11-rc1 available here: >>> >>> git://gitorious.org/~kristo/omap-pm/omap-pm-work.git >>> branch: mainline-3.11-rc1-omap-dt-clks >>> >>> Testing done: >>> >>> - boot + suspend tested on OMAP3 beagle C4 (omap3530) >>> - boot + suspend tested on OMAP4 panda ES (omap4460) >>> - boot tested on beagle bone (am335x) >>> >>> A boot test was also executed for DRA7 and OMAP5 on a separate branch >>> (mainline does not have OMAP5 / DRA7 support so far.) >> >> Thanks to your hints, I was able to get this to work with 3.11-rc1 on omap5 uevm >> using the following 3 patches. Please include them in your series. Thanks. > > Your patches don't apply cleanly to mainline currently, as the omap5 base support is still not merged. I deliberately left out the full omap5 integration because of that. Lets see how and when the integration proceeds, but I can track your patches meanwhile. > Strange, I didn't use any out of tree patch. Just 3.11-rc1 with your 33 patches on top. Are you on 3.11-rc2? cheers, -roger
On 07/24/2013 05:34 PM, Roger Quadros wrote: > On 07/24/2013 05:29 PM, Tero Kristo wrote: >> On 07/24/2013 05:16 PM, Roger Quadros wrote: >>> On 07/23/2013 10:19 AM, Tero Kristo wrote: >>>> Hi, >>>> >>>> Changes compared to previous version: >>>> >>>> - Clock init files moved from mach-omap2/ to drivers/clk/omap/ >>>> - AM33xx support added [patches 15-20] >>>> - OMAP3 support added [patches 21-29] >>>> - DRA7 APLL support added (thanks Keerthy) [patches 30-33] >>>> >>>> Test branch on top of 3.11-rc1 available here: >>>> >>>> git://gitorious.org/~kristo/omap-pm/omap-pm-work.git >>>> branch: mainline-3.11-rc1-omap-dt-clks >>>> >>>> Testing done: >>>> >>>> - boot + suspend tested on OMAP3 beagle C4 (omap3530) >>>> - boot + suspend tested on OMAP4 panda ES (omap4460) >>>> - boot tested on beagle bone (am335x) >>>> >>>> A boot test was also executed for DRA7 and OMAP5 on a separate branch >>>> (mainline does not have OMAP5 / DRA7 support so far.) >>> >>> Thanks to your hints, I was able to get this to work with 3.11-rc1 on omap5 uevm >>> using the following 3 patches. Please include them in your series. Thanks. >> >> Your patches don't apply cleanly to mainline currently, as the omap5 base support is still not merged. I deliberately left out the full omap5 integration because of that. Lets see how and when the integration proceeds, but I can track your patches meanwhile. >> > > Strange, I didn't use any out of tree patch. Just 3.11-rc1 with your 33 patches on top. > > Are you on 3.11-rc2? Oh, so OMAP5 hwmod data was actually merged now, cool. Sorry about the fuss. I can include your patches to the next rev if one is made. -Tero
From 8836bc00aea3c97206244c3f8a66e2726c835854 Mon Sep 17 00:00:00 2001 From: Roger Quadros <rogerq@ti.com> Date: Wed, 24 Jul 2013 16:30:55 +0300 Subject: [PATCH 3/3] CLK: omap5: Initialize USB_DPLL at boot USB_DPLL must be initialized and locked at boot so that USB modules can work. Signed-off-by: Roger Quadros <rogerq@ti.com> --- drivers/clk/omap/clk-54xx.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/drivers/clk/omap/clk-54xx.c b/drivers/clk/omap/clk-54xx.c index ade0481..a0b3c14 100644 --- a/drivers/clk/omap/clk-54xx.c +++ b/drivers/clk/omap/clk-54xx.c @@ -19,6 +19,12 @@ #define OMAP5_DPLL_ABE_DEFFREQ 98304000 +/* + * OMAP543x TRM, section "3.6.3.9.5 DPLL_USB Preferred Settings" + * states it must be at 960MHz + */ +#define OMAP5_DPLL_USB_DEFFREQ 960000000 + static struct omap_dt_clk omap54xx_clks[] = { DT_CLK(NULL, "timer_32k_ck", "sys_32k_ck"), DT_CLK("omap_timer.1", "sys_ck", "sys_clkin"), @@ -37,7 +43,7 @@ static struct omap_dt_clk omap54xx_clks[] = { int __init omap5xxx_clk_init(void) { int rc; - struct clk *abe_dpll_ref, *abe_dpll, *sys_32k_ck; + struct clk *abe_dpll_ref, *abe_dpll, *sys_32k_ck, *usb_dpll; dt_omap_clk_init(); @@ -54,5 +60,10 @@ int __init omap5xxx_clk_init(void) if (rc) pr_err("%s: failed to configure ABE DPLL!\n", __func__); + usb_dpll = clk_get_sys(NULL, "dpll_usb_ck"); + rc = clk_set_rate(usb_dpll, OMAP5_DPLL_USB_DEFFREQ); + if (rc) + pr_err("%s: failed to configure USB DPLL!\n", __func__); + return 0; } -- 1.7.4.1