Skip to contentSkip to conversation

PM: OMAP3 SDRC: fix some SDRAM settings for Qimonda parts

PATCH Applied Paul Walmsley 2 participants 7 messages May 14, 2009

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

v2 cover PM: OMAP3 SDRC: fix some SDRAM settings for Qimonda parts

Hi,

This series updates some SDRAM parameter settings for the Qimonda parts used on some 3430SDP boards.

Drop the 133.3MHz/66.6MHz rates from the Qimonda SDRAM file - these were only used on some early Labrador boards with slower SDRAM parts. Thanks to Richard Woodruff <[email protected]> for help with this patch.

Finally some 3430SDP boards are using bootloaders with rounded DPLL3 rates (e.g., 166000000 Hz rather than 165941176 Hz); update the Qimonda SDRAM parameters. This resolves -EINVALs during boot-time "Reprogramming SDRC" on 3430SDPs with updated bootloaders. Thanks to Kevin Hilman <[email protected]> for reporting this issue and testing the patch.

These patches will be queued up into the omap-clock-testing branch at the next opportunity.

---

size:
text data bss dec hex filename

3667957  196224  113216 3977397  3cb0b5 vmlinux.3430sdp.orig
3667957  196224  113216 3977397  3cb0b5 vmlinux.3430sdp

Paul Walmsley (2):
OMAP3 SDRC: Add rounded rates for devices using the Qimonda SDRAM OMAP3 SDRC: Drop 133.3MHz, 66.6MHz rates from Qimonda SDRAM params file

 .../mach-omap2/sdram-qimonda-hyb18m512160af-6.h    |   25 ++++++++++----------
 1 files changed, 12 insertions(+), 13 deletions(-)
#1 lore raw

PATCH v2 1/2 OMAP3 SDRC: Drop 133.3MHz, 66.6MHz rates from Qimonda SDRAM params file

Boards that used 133.3MHz maximum rate SDRAM were never released to the public and presumably used the OMAPZoom kernel; so, drop these unused rates. Viz.:

    http://marc.info/?l=linux-omap&m=124232922426311&w=2

This patch is a collaboration between Richard Woodruff <[email protected]> and Paul Walmsley <[email protected]>.

Cc Richard Woodruff <[email protected]>
---
 .../mach-omap2/sdram-qimonda-hyb18m512160af-6.h    |   21 +++-----------------
 1 files changed, 3 insertions(+), 18 deletions(-)
arch/arm/mach-omap2/sdram-qimonda-hyb18m512160af-6.h +3 -18
index 74a92c8..8b6f929 100644
@@ -1,8 +1,8 @@
 /*
  * SDRC register values for the Qimonda HYB18M512160AF-6
  *
- * Copyright (C) 2008 Texas Instruments, Inc.
- * Copyright (C) 2008 Nokia Corporation
+ * Copyright (C) 2008-2009 Texas Instruments, Inc.
+ * Copyright (C) 2008-2009 Nokia Corporation
  *
  * Paul Walmsley
  *
@@ -17,7 +17,6 @@
 #include <mach/sdrc.h>
 
 /* Qimonda HYB18M512160AF-6 */
-/* XXX Using ARE = 0x1 (no autorefresh burst) -- can this be changed? */
 static struct omap_sdrc_params hyb18m512160af6_sdrc_params[] = {
 	[0] = {
 		.rate	     = 165941176,
@@ -27,27 +26,13 @@ static struct omap_sdrc_params hyb18m512160af6_sdrc_params[] = {
 		.mr	     = 0x00000032,
 	},
 	[1] = {
-		.rate	     = 133333333,
-		.actim_ctrla = 0x5219b485,
-		.actim_ctrlb = 0x00012210,
-		.rfr_ctrl    = 0x0003de01,
-		.mr	     = 0x00000032,
-	},
-	[2] = {
 		.rate	     = 82970588,
 		.actim_ctrla = 0x31512283,
 		.actim_ctrlb = 0x0001220a,
 		.rfr_ctrl    = 0x00025501,
 		.mr	     = 0x00000022,
 	},
-	[3] = {
-		.rate	     = 66666666,
-		.actim_ctrla = 0x290d2243,
-		.actim_ctrlb = 0x00012208,
-		.rfr_ctrl    = 0x0001d601,
-		.mr	     = 0x00000022,
-	},
-	[4] = {
+	[2] = {
 		.rate	     = 0
 	},
 };
#3 lore raw

PATCH v2 2/2 OMAP3 SDRC: Add rounded rates for devices using the Qimonda SDRAM

In reply to Paul Walmsley

The 3430SDPs, many of which use Qimonda SDRAM, are finally using bootloaders that program rounded rates for DPLL3. Since no SDRAM memory timings are defined for the rounded rates, the initial SDRC reprogram during init fails. Add in the correct timings here.

Problem reported by Kevin Hilman <[email protected]>.

---
 .../mach-omap2/sdram-qimonda-hyb18m512160af-6.h    |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/sdram-qimonda-hyb18m512160af-6.h +16 -2
index 8b6f929..3751d29 100644
@@ -19,20 +19,34 @@
 /* Qimonda HYB18M512160AF-6 */
 static struct omap_sdrc_params hyb18m512160af6_sdrc_params[] = {
 	[0] = {
-		.rate	     = 165941176,
+		.rate	     = 166000000,
 		.actim_ctrla = 0x629db4c6,
 		.actim_ctrlb = 0x00012214,
 		.rfr_ctrl    = 0x0004dc01,
 		.mr	     = 0x00000032,
 	},
 	[1] = {
+		.rate	     = 165941176,
+		.actim_ctrla = 0x629db4c6,
+		.actim_ctrlb = 0x00012214,
+		.rfr_ctrl    = 0x0004dc01,
+		.mr	     = 0x00000032,
+	},
+	[2] = {
+		.rate	     = 83000000,
+		.actim_ctrla = 0x31512283,
+		.actim_ctrlb = 0x0001220a,
+		.rfr_ctrl    = 0x00025501,
+		.mr	     = 0x00000022,
+	},
+	[3] = {
 		.rate	     = 82970588,
 		.actim_ctrla = 0x31512283,
 		.actim_ctrlb = 0x0001220a,
 		.rfr_ctrl    = 0x00025501,
 		.mr	     = 0x00000022,
 	},
-	[2] = {
+	[4] = {
 		.rate	     = 0
 	},
 };
maintainer
#4 lore raw

PATCH v2 2/2 OMAP3 SDRC: Add rounded rates for devices using the

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

Initial commit ID (Likely to change): c82881eac1c6999abd768c548ad196c1973d3a55

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

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=c82881eac1c6999abd768c548ad196c1973d3a55

maintainer Applied
#5 lore raw
In reply to Paul Walmsley
Quoted 16 lines · Paul Walmsley

Hi,

This series updates some SDRAM parameter settings for the Qimonda parts used on some 3430SDP boards.

Drop the 133.3MHz/66.6MHz rates from the Qimonda SDRAM file - these were only used on some early Labrador boards with slower SDRAM parts. Thanks to Richard Woodruff <[email protected]> for help with this patch.

Finally some 3430SDP boards are using bootloaders with rounded DPLL3 rates (e.g., 166000000 Hz rather than 165941176 Hz); update the Qimonda SDRAM parameters. This resolves -EINVALs during boot-time "Reprogramming SDRC" on 3430SDPs with updated bootloaders. Thanks to Kevin Hilman <[email protected]> for reporting this issue and testing the patch.

Quoted 2 lines

These patches will be queued up into the omap-clock-testing branch at the next opportunity.

I've merged these two patches already into your older sdram patches in the omap3-upstream queue.

Tony

#6 lore raw
Quoted 17 lines · Tony Lindgren
Quoted 16 lines · Paul Walmsley

Hi,

This series updates some SDRAM parameter settings for the Qimonda parts used on some 3430SDP boards.

Drop the 133.3MHz/66.6MHz rates from the Qimonda SDRAM file - these were only used on some early Labrador boards with slower SDRAM parts. Thanks to Richard Woodruff <[email protected]> for help with this patch.

Finally some 3430SDP boards are using bootloaders with rounded DPLL3 rates (e.g., 166000000 Hz rather than 165941176 Hz); update the Qimonda SDRAM parameters. This resolves -EINVALs during boot-time "Reprogramming SDRC" on 3430SDPs with updated bootloaders. Thanks to Kevin Hilman <[email protected]> for reporting this issue and testing the patch.

Quoted 5 lines
Quoted 2 lines

These patches will be queued up into the omap-clock-testing branch at the next opportunity.

I've merged these two patches already into your older sdram patches in the omap3-upstream queue.

Sweet! Thanks!

- Paul