---

yaml --- r: 226493 b: refs/heads/master c: fbd208e h: refs/heads/master i: 226491: c0299c1 v: v3
git-mirror · Dec 17, 2010 · c7db0b9 · c7db0b9
1 parent 10bcded
commit c7db0b9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcd8d84633902fd1717d80f36a38b8a4305ca3d4
+refs/heads/master: fbd208e9772005c193459d1a0575c0787ad52f69
diff --git a/trunk/arch/arm/mach-omap2/sdram-nokia.c b/trunk/arch/arm/mach-omap2/sdram-nokia.c
@@ -46,7 +46,7 @@ struct sdram_timings {
 
 static struct omap_sdrc_params nokia_sdrc_params[4];
 
-static const struct sdram_timings memory_timings[] = {
+static const struct sdram_timings nokia_166mhz_timings[] = {
 	{
 		.casl = 3,
 		.tDAL = 33000,
@@ -160,7 +160,8 @@ static int set_sdrc_timing_regval_ps(u32 *regval, int st_bit, int end_bit,
 		err = -1;
 #endif
 
-static int sdrc_timings(int id, long rate)
+static int sdrc_timings(int id, long rate,
+			const struct sdram_timings *memory_timings)
 {
 	u32 ticks_per_ms;
 	u32 rfr, l;
@@ -213,9 +214,9 @@ struct omap_sdrc_params *nokia_get_sdram_timings(void)
 {
 	int err;
 
-	err = sdrc_timings(0, 41500000);
-	err |= sdrc_timings(1, 83000000);
-	err |= sdrc_timings(2, 166000000);
+	err = sdrc_timings(0, 41500000, nokia_166mhz_timings);
+	err |= sdrc_timings(1, 83000000, nokia_166mhz_timings);
+	err |= sdrc_timings(2, 166000000, nokia_166mhz_timings);
 
 	return &nokia_sdrc_params[0];
 }