diff for duplicates of <20091118224746.GU29266@atomide.com>

diff --git a/a/1.txt b/N1/1.txt
index f34a553..8ef4a48 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,10 +1,10 @@
 * Hiremath, Vaibhav <hvaibhav@ti.com> [091116 19:56]:
 > 
 > > -----Original Message-----
-> > From: Tony Lindgren [mailto:tony@atomide.com]
+> > From: Tony Lindgren [mailto:tony at atomide.com]
 > > Sent: Tuesday, November 17, 2009 4:58 AM
-> > To: linux-arm-kernel@lists.infradead.org
-> > Cc: Gupta, Ajay Kumar; linux-omap@vger.kernel.org; Hiremath,
+> > To: linux-arm-kernel at lists.infradead.org
+> > Cc: Gupta, Ajay Kumar; linux-omap at vger.kernel.org; Hiremath,
 > > Vaibhav; Premi, Sanjeev
 > > Subject: [PATCH 05/12] omap3evm: Add board revision function
 > > 
diff --git a/a/2.hdr b/a/2.hdr
deleted file mode 100644
index 6e32ecb..0000000
--- a/a/2.hdr
+++ /dev/null
@@ -1,2 +0,0 @@
-Content-Type: text/x-diff; charset=us-ascii
-Content-Disposition: inline; filename="omap3evm-revision-v2.patch"
diff --git a/a/2.txt b/a/2.txt
deleted file mode 100644
index d1a5136..0000000
--- a/a/2.txt
+++ /dev/null
@@ -1,106 +0,0 @@
->From f62482b652928c06c9ecfe546f03532276a6f5e6 Mon Sep 17 00:00:00 2001
-From: Ajay Kumar Gupta <ajay.gupta@ti.com>
-Date: Fri, 13 Nov 2009 17:37:30 -0800
-Subject: [PATCH] omap3evm: Add board revision function
-
-Added function to differentiate between the OMAP3EVM revisions. The
-chip-id of the ethernet PHY is being used for this purpose.
-
-Rev A to D : 0x01150000
-Rev >= E   : 0x92200000
-
-Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
-Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
-Signed-off-by: Sanjeev Premi <premi@ti.com>
-Signed-off-by: Tony Lindgren <tony@atomide.com>
-
-diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
-index 1edf06a..149d45c 100644
---- a/arch/arm/mach-omap2/board-omap3evm.c
-+++ b/arch/arm/mach-omap2/board-omap3evm.c
-@@ -46,9 +46,42 @@
- 
- #define OMAP3EVM_ETHR_START	0x2c000000
- #define OMAP3EVM_ETHR_SIZE	1024
-+#define OMAP3EVM_ETHR_ID_REV	0x50
- #define OMAP3EVM_ETHR_GPIO_IRQ	176
- #define OMAP3EVM_SMC911X_CS	5
- 
-+static u8 omap3_evm_version;
-+
-+u8 get_omap3_evm_rev(void)
-+{
-+	return omap3_evm_version;
-+}
-+EXPORT_SYMBOL(get_omap3_evm_rev);
-+
-+static void __init omap3_evm_get_revision(void)
-+{
-+	void __iomem *ioaddr;
-+	unsigned int smsc_id;
-+
-+	/* Ethernet PHY ID is stored at ID_REV register */
-+	ioaddr = ioremap_nocache(OMAP3EVM_ETHR_START, SZ_1K);
-+	if (!ioaddr)
-+		return;
-+	smsc_id = readl(ioaddr + OMAP3EVM_ETHR_ID_REV) & 0xFFFF0000;
-+	iounmap(ioaddr);
-+
-+	switch (smsc_id) {
-+	/*SMSC9115 chipset*/
-+	case 0x01150000:
-+		omap3_evm_version = OMAP3EVM_BOARD_GEN_1;
-+		break;
-+	/*SMSC 9220 chipset*/
-+	case 0x92200000:
-+	default:
-+		omap3_evm_version = OMAP3EVM_BOARD_GEN_2;
-+	}
-+}
-+
- static struct resource omap3evm_smc911x_resources[] = {
- 	[0] =	{
- 		.start	= OMAP3EVM_ETHR_START,
-@@ -321,6 +354,8 @@ static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
- 
- static void __init omap3_evm_init(void)
- {
-+	omap3_evm_get_revision();
-+
- 	omap3_evm_i2c_init();
- 
- 	platform_add_devices(omap3_evm_devices, ARRAY_SIZE(omap3_evm_devices));
-diff --git a/arch/arm/plat-omap/include/plat/board.h b/arch/arm/plat-omap/include/plat/board.h
-index c4fc69f..abb17b6 100644
---- a/arch/arm/plat-omap/include/plat/board.h
-+++ b/arch/arm/plat-omap/include/plat/board.h
-@@ -14,6 +14,18 @@
- 
- #include <plat/gpio-switch.h>
- 
-+/*
-+ * OMAP35x EVM revision
-+ * Run time detection of EVM revision is done by reading Ethernet
-+ * PHY ID -
-+ *	GEN_1	= 0x01150000
-+ *	GEN_2	= 0x92200000
-+ */
-+enum {
-+	OMAP3EVM_BOARD_GEN_1 = 0,	/* EVM Rev between  A - D */
-+	OMAP3EVM_BOARD_GEN_2,		/* EVM Rev >= Rev E */
-+};
-+
- /* Different peripheral ids */
- #define OMAP_TAG_CLOCK		0x4f01
- #define OMAP_TAG_LCD		0x4f05
-@@ -157,4 +169,10 @@ extern int omap_board_config_size;
- /* for TI reference platforms sharing the same debug card */
- extern int debug_card_init(u32 addr, unsigned gpio);
- 
-+/* OMAP3EVM revision */
-+#if defined(CONFIG_MACH_OMAP3EVM)
-+u8 get_omap3_evm_rev(void);
-+#else
-+#define get_omap3_evm_rev() (-EINVAL)
-+#endif
- #endif
diff --git a/a/3.hdr b/a/3.hdr
deleted file mode 100644
index 4b86001..0000000
--- a/a/3.hdr
+++ /dev/null
@@ -1,4 +0,0 @@
-Content-Type: text/plain; charset="us-ascii"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Content-Disposition: inline
diff --git a/a/3.txt b/a/3.txt
deleted file mode 100644
index 8133cf0..0000000
--- a/a/3.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-_______________________________________________
-linux-arm-kernel mailing list
-linux-arm-kernel@lists.infradead.org
-http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/a/content_digest b/N1/content_digest
index a01e288..fc7758a 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,26 +1,19 @@
  "ref\020091116232435.24892.81547.stgit@localhost\0"
  "ref\020091116232734.24892.33820.stgit@localhost\0"
  "ref\019F8576C6E063C45BE387C64729E7394043702B5B5@dbde02.ent.ti.com\0"
- "From\0Tony Lindgren <tony@atomide.com>\0"
- "Subject\0Re: [PATCH 05/12] omap3evm: Add board revision function, v2\0"
+ "From\0tony@atomide.com (Tony Lindgren)\0"
+ "Subject\0[PATCH 05/12] omap3evm: Add board revision function, v2\0"
  "Date\0Wed, 18 Nov 2009 14:47:47 -0800\0"
- "To\0Hiremath"
- " Vaibhav <hvaibhav@ti.com>\0"
- "Cc\0Premi"
-  Sanjeev <premi@ti.com>
-  Gupta
-  Ajay Kumar <ajay.gupta@ti.com>
-  linux-omap@vger.kernel.org <linux-omap@vger.kernel.org>
- " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0"
- "\01:1\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
+ "\00:1\0"
  "b\0"
  "* Hiremath, Vaibhav <hvaibhav@ti.com> [091116 19:56]:\n"
  "> \n"
  "> > -----Original Message-----\n"
- "> > From: Tony Lindgren [mailto:tony@atomide.com]\n"
+ "> > From: Tony Lindgren [mailto:tony at atomide.com]\n"
  "> > Sent: Tuesday, November 17, 2009 4:58 AM\n"
- "> > To: linux-arm-kernel@lists.infradead.org\n"
- "> > Cc: Gupta, Ajay Kumar; linux-omap@vger.kernel.org; Hiremath,\n"
+ "> > To: linux-arm-kernel at lists.infradead.org\n"
+ "> > Cc: Gupta, Ajay Kumar; linux-omap at vger.kernel.org; Hiremath,\n"
  "> > Vaibhav; Premi, Sanjeev\n"
  "> > Subject: [PATCH 05/12] omap3evm: Add board revision function\n"
  "> > \n"
@@ -75,120 +68,5 @@
  "Good catch, updated version below.\n"
  "\n"
  Tony
- "\01:2\0"
- "fn\0omap3evm-revision-v2.patch\0"
- "b\0"
- ">From f62482b652928c06c9ecfe546f03532276a6f5e6 Mon Sep 17 00:00:00 2001\n"
- "From: Ajay Kumar Gupta <ajay.gupta@ti.com>\n"
- "Date: Fri, 13 Nov 2009 17:37:30 -0800\n"
- "Subject: [PATCH] omap3evm: Add board revision function\n"
- "\n"
- "Added function to differentiate between the OMAP3EVM revisions. The\n"
- "chip-id of the ethernet PHY is being used for this purpose.\n"
- "\n"
- "Rev A to D : 0x01150000\n"
- "Rev >= E   : 0x92200000\n"
- "\n"
- "Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>\n"
- "Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>\n"
- "Signed-off-by: Sanjeev Premi <premi@ti.com>\n"
- "Signed-off-by: Tony Lindgren <tony@atomide.com>\n"
- "\n"
- "diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c\n"
- "index 1edf06a..149d45c 100644\n"
- "--- a/arch/arm/mach-omap2/board-omap3evm.c\n"
- "+++ b/arch/arm/mach-omap2/board-omap3evm.c\n"
- "@@ -46,9 +46,42 @@\n"
- " \n"
- " #define OMAP3EVM_ETHR_START\t0x2c000000\n"
- " #define OMAP3EVM_ETHR_SIZE\t1024\n"
- "+#define OMAP3EVM_ETHR_ID_REV\t0x50\n"
- " #define OMAP3EVM_ETHR_GPIO_IRQ\t176\n"
- " #define OMAP3EVM_SMC911X_CS\t5\n"
- " \n"
- "+static u8 omap3_evm_version;\n"
- "+\n"
- "+u8 get_omap3_evm_rev(void)\n"
- "+{\n"
- "+\treturn omap3_evm_version;\n"
- "+}\n"
- "+EXPORT_SYMBOL(get_omap3_evm_rev);\n"
- "+\n"
- "+static void __init omap3_evm_get_revision(void)\n"
- "+{\n"
- "+\tvoid __iomem *ioaddr;\n"
- "+\tunsigned int smsc_id;\n"
- "+\n"
- "+\t/* Ethernet PHY ID is stored at ID_REV register */\n"
- "+\tioaddr = ioremap_nocache(OMAP3EVM_ETHR_START, SZ_1K);\n"
- "+\tif (!ioaddr)\n"
- "+\t\treturn;\n"
- "+\tsmsc_id = readl(ioaddr + OMAP3EVM_ETHR_ID_REV) & 0xFFFF0000;\n"
- "+\tiounmap(ioaddr);\n"
- "+\n"
- "+\tswitch (smsc_id) {\n"
- "+\t/*SMSC9115 chipset*/\n"
- "+\tcase 0x01150000:\n"
- "+\t\tomap3_evm_version = OMAP3EVM_BOARD_GEN_1;\n"
- "+\t\tbreak;\n"
- "+\t/*SMSC 9220 chipset*/\n"
- "+\tcase 0x92200000:\n"
- "+\tdefault:\n"
- "+\t\tomap3_evm_version = OMAP3EVM_BOARD_GEN_2;\n"
- "+\t}\n"
- "+}\n"
- "+\n"
- " static struct resource omap3evm_smc911x_resources[] = {\n"
- " \t[0] =\t{\n"
- " \t\t.start\t= OMAP3EVM_ETHR_START,\n"
- "@@ -321,6 +354,8 @@ static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {\n"
- " \n"
- " static void __init omap3_evm_init(void)\n"
- " {\n"
- "+\tomap3_evm_get_revision();\n"
- "+\n"
- " \tomap3_evm_i2c_init();\n"
- " \n"
- " \tplatform_add_devices(omap3_evm_devices, ARRAY_SIZE(omap3_evm_devices));\n"
- "diff --git a/arch/arm/plat-omap/include/plat/board.h b/arch/arm/plat-omap/include/plat/board.h\n"
- "index c4fc69f..abb17b6 100644\n"
- "--- a/arch/arm/plat-omap/include/plat/board.h\n"
- "+++ b/arch/arm/plat-omap/include/plat/board.h\n"
- "@@ -14,6 +14,18 @@\n"
- " \n"
- " #include <plat/gpio-switch.h>\n"
- " \n"
- "+/*\n"
- "+ * OMAP35x EVM revision\n"
- "+ * Run time detection of EVM revision is done by reading Ethernet\n"
- "+ * PHY ID -\n"
- "+ *\tGEN_1\t= 0x01150000\n"
- "+ *\tGEN_2\t= 0x92200000\n"
- "+ */\n"
- "+enum {\n"
- "+\tOMAP3EVM_BOARD_GEN_1 = 0,\t/* EVM Rev between  A - D */\n"
- "+\tOMAP3EVM_BOARD_GEN_2,\t\t/* EVM Rev >= Rev E */\n"
- "+};\n"
- "+\n"
- " /* Different peripheral ids */\n"
- " #define OMAP_TAG_CLOCK\t\t0x4f01\n"
- " #define OMAP_TAG_LCD\t\t0x4f05\n"
- "@@ -157,4 +169,10 @@ extern int omap_board_config_size;\n"
- " /* for TI reference platforms sharing the same debug card */\n"
- " extern int debug_card_init(u32 addr, unsigned gpio);\n"
- " \n"
- "+/* OMAP3EVM revision */\n"
- "+#if defined(CONFIG_MACH_OMAP3EVM)\n"
- "+u8 get_omap3_evm_rev(void);\n"
- "+#else\n"
- "+#define get_omap3_evm_rev() (-EINVAL)\n"
- "+#endif\n"
-  #endif
- "\01:3\0"
- "b\0"
- "_______________________________________________\n"
- "linux-arm-kernel mailing list\n"
- "linux-arm-kernel@lists.infradead.org\n"
- http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
 
-584fb7140d91c2f973fcf1cb4e1b9082f833ec5e45c58f83ff081a3e40f53852
+24bf7ed5ce31204fd867502ba1070392d644e8dee07fcf584e12ab91cfd30e27
