Skip to contentSkip to conversation

OMAP3: Lock DPLL5 at boot

PATCH In review Anand Gadiyar 4 participants 10 messages Sep 8, 2009 – Sep 30, 2009

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 OMAP3: Lock DPLL5 at boot

From: Rajendra Nayak <[email protected]>

OMAP3: Lock DPLL5 at boot

Lock DPLL5 at 120MHz at boot. The USBHOST 120MHz f-clock and USBTLL f-clock are the only users of this DPLL, and 120MHz is is the only recommended rate for these clocks.

With this patch, the 60 MHz ULPI clock is generated correctly.

Tested on an OMAP3430 SDP.

---
Incorporated all 3 comments by Paul and Benoit. Updated $SUBJECT to reflect the change.

 arch/arm/mach-omap2/clock34xx.c |   35 +++++++++++++++++++++++++++++++++++
 1 files changed, 35 insertions(+)
arch/arm/mach-omap2/clock34xx.c +35 -0
Index: linux-omap-2.6/arch/arm/mach-omap2/clock34xx.c
===================================================================
@@ -338,6 +338,13 @@ static struct omap_clk omap34xx_clks[] =
  */
 #define SDRC_MPURATE_LOOPS		96
 
+/*
+ * DPLL5_FREQ_FOR_USBHOST: USBHOST and USBTLL are the only clocks
+ * that are sourced by DPLL5, and both of these require this clock
+ * to be at 120 MHz for proper operation.
+ */
+#define DPLL5_FREQ_FOR_USBHOST		120000000
+
 /**
  * omap3430es2_clk_ssi_find_idlest - return CM_IDLEST info for SSI
  * @clk: struct clk * being enabled
@@ -1056,6 +1063,28 @@ void omap2_clk_prepare_for_reboot(void)
 #endif
 }
 
+static void omap3_clk_lock_dpll5(void)
+{
+	struct clk *dpll5_clk;
+	struct clk *dpll5_m2_clk;
+
+	dpll5_clk = clk_get(NULL, "dpll5_ck");
+	clk_set_rate(dpll5_clk, DPLL5_FREQ_FOR_USBHOST);
+	clk_enable(dpll5_clk);
+
+	/* Enable autoidle to allow it to enter low power bypass */
+	omap3_dpll_allow_idle(dpll5_clk);
+
+	/* Program dpll5_m2_clk divider for no division */
+	dpll5_m2_clk = clk_get(NULL, "dpll5_m2_ck");
+	clk_enable(dpll5_m2_clk);
+	clk_set_rate(dpll5_m2_clk, DPLL5_FREQ_FOR_USBHOST);
+
+	clk_disable(dpll5_m2_clk);
+	clk_disable(dpll5_clk);
+	return;
+}
+
 /* REVISIT: Move this init stuff out into clock.c */
 
 /*
@@ -1148,6 +1177,12 @@ int __init omap2_clk_init(void)
 	 */
 	clk_enable_init_clocks();
 
+	/*
+	 * Lock DPLL5 and put it in autoidle.
+	 */
+	if (omap_rev() >= OMAP3430_REV_ES2_0)
+		omap3_clk_lock_dpll5();
+
 	/* Avoid sleeping during omap2_clk_prepare_for_reboot() */
 	/* REVISIT: not yet ready for 343x */
 #if 0
maintainer
#1 lore raw
Quoted 10 lines · Anand Gadiyar

From: Rajendra Nayak <[email protected]>

OMAP3: Lock DPLL5 at boot

Lock DPLL5 at 120MHz at boot. The USBHOST 120MHz f-clock and USBTLL f-clock are the only users of this DPLL, and 120MHz is is the only recommended rate for these clocks.

With this patch, the 60 MHz ULPI clock is generated correctly.

Quoted 7 lines

Tested on an OMAP3430 SDP.

---
Incorporated all 3 comments by Paul and Benoit. Updated $SUBJECT to reflect the change.

Thanks for the changes, I will queue this in a for-next branch for .33.

- Paul

#2 lore raw

Paul

Quoted 22 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Paul Walmsley
Sent: Wednesday, September 09, 2009 10:43 AM
To: Gadiyar, Anand
Cc: [email protected]; Nayak, Rajendra; Cousson, Benoit
Subject: Re: [PATCH] OMAP3: Lock DPLL5 at boot

Quoted 12 lines · Anand Gadiyar

From: Rajendra Nayak <[email protected]>

OMAP3: Lock DPLL5 at boot

Lock DPLL5 at 120MHz at boot. The USBHOST 120MHz f-clock and USBTLL f-clock are the only users of this DPLL, and 120MHz is is the only recommended rate for these clocks.

With this patch, the 60 MHz ULPI clock is generated correctly.

Tested on an OMAP3430 SDP.

Quoted 7 lines
Quoted 5 lines

---
Incorporated all 3 comments by Paul and Benoit. Updated $SUBJECT to reflect the change.

Thanks for the changes, I will queue this in a for-next branch for .33.

Is this for .33 or .32?

Quoted 7 lines

- Paul
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

maintainer
#3 lore raw
Quoted 7 lines · Vikram
Quoted 5 lines

From: [email protected] [mailto:[email protected]] On Behalf Of Paul Walmsley

Quoted 1 line

$SUBJECT to reflect the change.

Thanks for the changes, I will queue this in a for-next branch for .33.

Is this for .33 or .32?

I think it might be a little late for .32. If there is some crash or instability that this fixes, we could queue it up for .32-fixes ?

- Paul

#4 lore raw
Quoted 4 lines · Paul Walmsley
Quoted 2 lines · Vikram
Quoted 2 lines

From: [email protected] [mailto:[email protected]] On Behalf Of Paul Walmsley

Quoted 9 lines
Quoted 5 lines
Quoted 3 lines
Quoted 1 line

$SUBJECT to reflect the change.

Thanks for the changes, I will queue this in a for-next branch for .33.

Is this for .33 or .32?

I think it might be a little late for .32. If there is some crash or instability that this fixes, we could queue it up for .32-fixes ?

Well, without this, there's no way the child clocks can be enabled correctly.

Possibly it qualifies as a bug-fix in clock framework?

Rajendra had created this patch quite a while ago and it has received sufficient testing on various codebases - I guess we just missed sending it out to l-o early enough.

- Anand

maintainer
#5 lore raw
Quoted 7 lines · Anand
Quoted 6 lines · Paul Walmsley
Quoted 4 lines · Vikram
Quoted 4 lines

From: [email protected] [mailto:[email protected]] On Behalf Of Paul Walmsley

Quoted 1 line

$SUBJECT to reflect the change.

Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
Quoted 1 line

Thanks for the changes, I will queue this in a for-next branch for .33.

Is this for .33 or .32?

I think it might be a little late for .32. If there is some crash or instability that this fixes, we could queue it up for .32-fixes ?

Well, without this, there's no way the child clocks can be enabled correctly.

OK. So is it the case that USBHOST/USBTLL/USIM won't work without this fix?

If so then we'll queue it for .32-fixes. Since .32 is already at -rc9, I think it is too late for .32.

- Paul

#6 lore raw
Quoted 11 lines
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
Quoted 1 line

Thanks for the changes, I will queue this in a for-next branch for .33.

Is this for .33 or .32?

I think it might be a little late for .32. If there is some crash or instability that this fixes, we could queue it up for .32-fixes ?

Well, without this, there's no way the child clocks can be enabled correctly.

OK. So is it the case that USBHOST/USBTLL/USIM won't work without this fix?

Yup. Not sure about USIM - will check.

Quoted 4 lines

If so then we'll queue it for .32-fixes. Since .32 is already at -rc9, I think it is too late for .32.

Would be nice. Thanks!

#7 lore raw
Quoted 12 lines
Quoted 11 lines
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
Quoted 1 line

Thanks for the changes, I will queue this in a for-next branch for .33.

Is this for .33 or .32?

I think it might be a little late for .32. If there is some crash or instability that this fixes, we could queue it up for .32-fixes ?

Well, without this, there's no way the child clocks can be enabled correctly.

OK. So is it the case that USBHOST/USBTLL/USIM won't work without this fix?

Quoted 8 lines

Yup. Not sure about USIM - will check.

Quoted 4 lines

If so then we'll queue it for .32-fixes. Since .32 is already at -rc9, I think it is too late for .32.

Would be nice. Thanks!

Paul,

Is this patch already queued up somewhere, or are you waiting for a clarification from me on the USIM?

(I haven't had a chance to look yet, since this is not in the regular TRM)

- Anand

maintainer
#8 lore raw
Quoted 22 lines · Gadiyar, Anand
Quoted 12 lines
Quoted 11 lines
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
Quoted 1 line

Thanks for the changes, I will queue this in a for-next branch for .33.

Is this for .33 or .32?

I think it might be a little late for .32. If there is some crash or instability that this fixes, we could queue it up for .32-fixes ?

Well, without this, there's no way the child clocks can be enabled correctly.

OK. So is it the case that USBHOST/USBTLL/USIM won't work without this fix?

Quoted 8 lines

Yup. Not sure about USIM - will check.

Quoted 4 lines

If so then we'll queue it for .32-fixes. Since .32 is already at -rc9, I think it is too late for .32.

Would be nice. Thanks!

Quoted 6 lines

Paul,

Is this patch already queued up somewhere, or are you waiting for a clarification from me on the USIM?

(I haven't had a chance to look yet, since this is not in the regular TRM)

I'll add this to omap-fixes-testing while we're waiting to put his fixes queue together. This way we can get rid of the remaining nasty stuff in the ehci branch.

Tony

maintainer
#9 lore raw

PATCH 1/1 OMAP3: Lock DPLL5 at boot

In reply to Anand Gadiyar

This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Branch in linux-omap: omap-fixes-testing

Initial commit ID (Likely to change): d3c59a8141676bc45f0341b470845b298d6a2a51

PatchWorks
http://patchwork.kernel.org/patch/46216/

Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=d3c59a8141676bc45f0341b470845b298d6a2a51