Merge lp:~doanac/x-loader/overo-clock-fix into lp:x-loader

Proposed by Andy Doan
Status: Merged
Merged at revision: 6
Proposed branch: lp:~doanac/x-loader/overo-clock-fix
Merge into: lp:x-loader
Diff against target: 45 lines (+33/-0)
2 files modified
debian/patches/09-overo-Fix-bug-in-prcm_init.patch (+32/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~doanac/x-loader/overo-clock-fix
Reviewer Review Type Date Requested Status
X-Loader Packagers Pending
Review via email: mp+53935@code.launchpad.net

Description of the change

This fixes the clocking issue I'm seeing on my Overo Tide. Its just pulling in the upstream fix from Steve Sakoman.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'debian/patches/09-overo-Fix-bug-in-prcm_init.patch'
2--- debian/patches/09-overo-Fix-bug-in-prcm_init.patch 1970-01-01 00:00:00 +0000
3+++ debian/patches/09-overo-Fix-bug-in-prcm_init.patch 2011-03-18 02:57:24 +0000
4@@ -0,0 +1,32 @@
5+From 24b8b7f41a83540433024854736518876257672c Mon Sep 17 00:00:00 2001
6+From: Steve Sakoman <steve@sakoman.com>
7+Date: Sat, 29 Jan 2011 00:52:29 +0530
8+Subject: [PATCH] overo: Fix bug in prcm_init
9+
10+The overo get_cpu_rev function was extended when 37XX support was
11+added, but I neglected to modify the index calculation in prcm_init
12+to compensate.
13+
14+Signed-off-by: Steve Sakoman <steve@sakoman.com>
15+Tested-by: Philip Balister <philip@opensdr.com>
16+Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
17+---
18+ board/overo/overo.c | 2 +-
19+ 1 files changed, 1 insertions(+), 1 deletions(-)
20+
21+diff --git a/board/overo/overo.c b/board/overo/overo.c
22+index 8df53e5..b2c536a 100644
23+--- a/board/overo/overo.c
24++++ b/board/overo/overo.c
25+@@ -610,7 +610,7 @@ void prcm_init(void)
26+ * and sil_index will get the values for that SysClk for the
27+ * appropriate silicon rev.
28+ */
29+- sil_index = get_cpu_rev() - 1;
30++ sil_index = (get_cpu_rev() == CPU_3XX_ES10) ? 0 : 1;
31+
32+ /* Unlock MPU DPLL (slows things down, and needed later) */
33+ sr32(CM_CLKEN_PLL_MPU, 0, 3, PLL_LOW_POWER_BYPASS);
34+--
35+1.7.4.1
36+
37
38=== modified file 'debian/patches/series'
39--- debian/patches/series 2011-01-26 00:11:14 +0000
40+++ debian/patches/series 2011-03-18 02:57:24 +0000
41@@ -6,3 +6,4 @@
42 06-omap4_disable_slimbus_and_pad_clks.patch
43 07-omap4_make_1ghz_as_default_mpu_clock.patch
44 08-igepv2_fixing_makefile.patch
45+09-overo-Fix-bug-in-prcm_init.patch

Subscribers

People subscribed via source and target branches

to all changes: