From 317989406bdfd5d577e7158b2d9b132e5781e540 Mon Sep 17 00:00:00 2001
From: Adrian Hunter <adrian.hunter@nokia.com>
Date: Thu, 9 Dec 2010 11:22:50 +0200
Subject: [PATCH] --- yaml --- r: 226543 b: refs/heads/master c:
 4931445b94f49672028b81ace9d4eee8ddf19ab2 h: refs/heads/master i:   226541:
 81ee257d091b1662cf8bba772abe72ef0ab5ed41   226539:
 a1540278af0c2339c9012d603c3ce68841fee290   226535:
 68beaa71d166a9aad885a51a2992639ba39aac29   226527:
 90f2f7c0834fbf5596c894dc51f9354b84594de5 v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/arm/mach-omap2/gpmc-onenand.c | 9 +++++++++
 trunk/drivers/mtd/onenand/omap2.c        | 3 +++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1b4b27474f88..940cb1cfe412 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3551f5b0c3ca7aaa053e554e3ee766983b5d713
+refs/heads/master: 4931445b94f49672028b81ace9d4eee8ddf19ab2
diff --git a/trunk/arch/arm/mach-omap2/gpmc-onenand.c b/trunk/arch/arm/mach-omap2/gpmc-onenand.c
index 1db606ca007e..3a7d25fb00ef 100644
--- a/trunk/arch/arm/mach-omap2/gpmc-onenand.c
+++ b/trunk/arch/arm/mach-omap2/gpmc-onenand.c
@@ -173,6 +173,15 @@ static int omap2_onenand_set_sync_mode(struct omap_onenand_platform_data *cfg,
 	}
 
 	switch (freq) {
+	case 104:
+		min_gpmc_clk_period = 9600; /* 104 MHz */
+		t_ces   = 3;
+		t_avds  = 4;
+		t_avdh  = 2;
+		t_ach   = 3;
+		t_aavdh = 6;
+		t_rdyo  = 9;
+		break;
 	case 83:
 		min_gpmc_clk_period = 12000; /* 83 MHz */
 		t_ces   = 5;
diff --git a/trunk/drivers/mtd/onenand/omap2.c b/trunk/drivers/mtd/onenand/omap2.c
index 9f322f1a7f22..d0894ca7798b 100644
--- a/trunk/drivers/mtd/onenand/omap2.c
+++ b/trunk/drivers/mtd/onenand/omap2.c
@@ -721,6 +721,9 @@ static int __devinit omap2_onenand_probe(struct platform_device *pdev)
 	case 3:
 		c->freq = 83;
 		break;
+	case 4:
+		c->freq = 104;
+		break;
 	}
 
 #ifdef CONFIG_MTD_PARTITIONS