From 75da2a1801975d104c040dc537e7d13b8e8029d8 Mon Sep 17 00:00:00 2001
From: Igor Dmitriev <ext-dmitriev.igor@nokia.com>
Date: Tue, 13 Dec 2011 10:48:54 -0800
Subject: [PATCH] --- yaml --- r: 281679 b: refs/heads/master c:
 ef211dc626beb47fc11d4aba27a8c1b20a4b3b4a h: refs/heads/master i:   281677:
 c9081e9c7d559d439cd203de7a3a940a11e2126f   281675:
 002f79e5d68349a74d7d4b8cb72d54e61612efe7   281671:
 db1fa5921668ed34fcb5c26fc6072d2f1c18c86f   281663:
 edf0926e1f88336a3469329f3f82c1d0bf29ef15 v: v3

---
 [refs]                                  |  2 +-
 trunk/arch/arm/mach-omap2/sdram-nokia.c | 25 ++++++++++++++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7903502ec0d4..9a83df33a755 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3dad5356aa47097cf67027cf0a07298b4f5baef6
+refs/heads/master: ef211dc626beb47fc11d4aba27a8c1b20a4b3b4a
diff --git a/trunk/arch/arm/mach-omap2/sdram-nokia.c b/trunk/arch/arm/mach-omap2/sdram-nokia.c
index ee3a8ad304cb..7479d7ea1379 100644
--- a/trunk/arch/arm/mach-omap2/sdram-nokia.c
+++ b/trunk/arch/arm/mach-omap2/sdram-nokia.c
@@ -1,7 +1,7 @@
 /*
  * SDRC register values for Nokia boards
  *
- * Copyright (C) 2008, 2010 Nokia Corporation
+ * Copyright (C) 2008, 2010-2011 Nokia Corporation
  *
  * Lauri Leukkunen <lauri.leukkunen@nokia.com>
  *
@@ -107,14 +107,37 @@ static const struct sdram_timings nokia_195dot2mhz_timings[] = {
 	},
 };
 
+static const struct sdram_timings nokia_200mhz_timings[] = {
+	{
+		.casl = 3,
+		.tDAL = 30000,
+		.tDPL = 15000,
+		.tRRD = 10000,
+		.tRCD = 20000,
+		.tRP = 15000,
+		.tRAS = 40000,
+		.tRC = 55000,
+		.tRFC = 140000,
+		.tXSR = 200000,
+
+		.tREF = 7800,
+
+		.tXP = 2,
+		.tCKE = 4,
+		.tWTR = 2
+	},
+};
+
 static const struct {
 	long rate;
 	struct sdram_timings const *data;
 } nokia_timings[] = {
 	{ 83000000, nokia_166mhz_timings },
 	{ 97600000, nokia_97dot6mhz_timings },
+	{ 100000000, nokia_200mhz_timings },
 	{ 166000000, nokia_166mhz_timings },
 	{ 195200000, nokia_195dot2mhz_timings },
+	{ 200000000, nokia_200mhz_timings },
 };
 static struct omap_sdrc_params nokia_sdrc_params[ARRAY_SIZE(nokia_timings) + 1];