diff for duplicates of <4D66AAE4.4000308@eukrea.com>

diff --git a/a/1.txt b/N1/1.txt
index ec34863..38a33e8 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -37,3 +37,10 @@ enable the internal pull up :
 			PAD_CTL_DSE_HIGH | PAD_CTL_PUE | PAD_CTL_HYS),
 
 Eric
+-------------- next part --------------
+A non-text attachment was scrubbed...
+Name: mx51_sdhci_cd_fix.patch
+Type: text/x-patch
+Size: 2488 bytes
+Desc: not available
+URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110224/e118ff7a/attachment-0001.bin>
diff --git a/a/2.hdr b/a/2.hdr
deleted file mode 100644
index dc102ae..0000000
--- a/a/2.hdr
+++ /dev/null
@@ -1,5 +0,0 @@
-Content-Type: text/x-patch;
- name="mx51_sdhci_cd_fix.patch"
-Content-Transfer-Encoding: 7bit
-Content-Disposition: attachment;
- filename="mx51_sdhci_cd_fix.patch"
diff --git a/a/2.txt b/a/2.txt
deleted file mode 100644
index dad2af9..0000000
--- a/a/2.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
-index 8ac039a..be11151 100644
---- a/drivers/mmc/host/sdhci-esdhc-imx.c
-+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
-@@ -217,6 +217,8 @@ static int esdhc_pltfm_init(struct sdhci_host *host, struct sdhci_pltfm_data *pd
- 		/* Now we have a working card_detect again */
- 		host->quirks &= ~SDHCI_QUIRK_BROKEN_CARD_DETECTION;
- 	}
-+	if (cpu_is_mx51())
-+		host->quirks &= ~SDHCI_QUIRK_BROKEN_CARD_DETECTION;
- 
- 	return 0;
- 
-diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
-index 9e15f41..11ef076 100644
---- a/drivers/mmc/host/sdhci.c
-+++ b/drivers/mmc/host/sdhci.c
-@@ -127,10 +127,14 @@ static void sdhci_set_card_detection(struct sdhci_host *host, bool enable)
- 	if (host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION)
- 		return;
- 
--	if (enable)
-+	sdhci_mask_irqs(host, irqs);
-+	if (enable) {
-+		if (!(sdhci_readl(host, SDHCI_PRESENT_STATE) & SDHCI_CARD_PRESENT))
-+			irqs = SDHCI_INT_CARD_INSERT;
-+		else
-+			irqs = SDHCI_INT_CARD_REMOVE;
- 		sdhci_unmask_irqs(host, irqs);
--	else
--		sdhci_mask_irqs(host, irqs);
-+	}
- }
- 
- static void sdhci_enable_card_detection(struct sdhci_host *host)
-@@ -992,6 +996,9 @@ static void sdhci_set_clock(struct sdhci_host *host, unsigned int clock)
- 	u16 clk;
- 	unsigned long timeout;
- 
-+	if ((clock == 0) && (SDHCI_INT_CARD_INSERT & sdhci_readl(host, SDHCI_INT_ENABLE)))
-+		goto out;
-+
- 	if (clock == host->clock)
- 		return;
- 
-@@ -1001,6 +1008,7 @@ static void sdhci_set_clock(struct sdhci_host *host, unsigned int clock)
- 			return;
- 	}
- 
-+
- 	sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);
- 
- 	if (clock == 0)
-@@ -1583,9 +1591,18 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id)
- 	DBG("*** %s got interrupt: 0x%08x\n",
- 		mmc_hostname(host->mmc), intmask);
- 
--	if (intmask & (SDHCI_INT_CARD_INSERT | SDHCI_INT_CARD_REMOVE)) {
--		sdhci_writel(host, intmask & (SDHCI_INT_CARD_INSERT |
--			SDHCI_INT_CARD_REMOVE), SDHCI_INT_STATUS);
-+	if (intmask & SDHCI_INT_CARD_INSERT) {
-+		sdhci_unmask_irqs(host, SDHCI_INT_CARD_REMOVE);
-+		sdhci_mask_irqs(host, SDHCI_INT_CARD_INSERT);
-+		sdhci_writel(host, intmask & SDHCI_INT_CARD_INSERT,
-+			SDHCI_INT_STATUS);
-+		tasklet_schedule(&host->card_tasklet);
-+	}
-+	if (intmask & SDHCI_INT_CARD_REMOVE) {
-+		sdhci_unmask_irqs(host, SDHCI_INT_CARD_INSERT);
-+		sdhci_mask_irqs(host, SDHCI_INT_CARD_REMOVE);
-+		sdhci_writel(host, intmask & SDHCI_INT_CARD_REMOVE,
-+			SDHCI_INT_STATUS);
- 		tasklet_schedule(&host->card_tasklet);
- 	}
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 d2cea29..94567de 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,14 +1,10 @@
  "ref\01298469118-25282-1-git-send-email-w.sang@pengutronix.de\0"
  "ref\087k4gp3bl1.fsf@lebrac.rtp-net.org\0"
- "From\0Eric Benard <eric@eukrea.com>\0"
- "Subject\0Re: [PATCH V3 0/5] sdhci-esdhc-imx: use gpio for write protection and\tcard detection\0"
+ "From\0eric@eukrea.com (Eric Benard)\0"
+ "Subject\0[PATCH V3 0/5] sdhci-esdhc-imx: use gpio for write protection and\tcard detection\0"
  "Date\0Thu, 24 Feb 2011 20:00:52 +0100\0"
- "To\0Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org>\0"
- "Cc\0Chris Ball <cjb@laptop.org>"
-  linux-mmc@vger.kernel.org
-  Wolfram Sang <w.sang@pengutronix.de>
- " linux-arm-kernel@lists.infradead.org\0"
- "\01:1\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
+ "\00:1\0"
  "b\0"
  "Hi Arnaud,\n"
  "\n"
@@ -48,89 +44,13 @@
  "\t\t\tPAD_CTL_PKE | PAD_CTL_SRE_FAST |\n"
  "\t\t\tPAD_CTL_DSE_HIGH | PAD_CTL_PUE | PAD_CTL_HYS),\n"
  "\n"
- Eric
- "\01:2\0"
- "fn\0mx51_sdhci_cd_fix.patch\0"
- "b\0"
- "diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c\n"
- "index 8ac039a..be11151 100644\n"
- "--- a/drivers/mmc/host/sdhci-esdhc-imx.c\n"
- "+++ b/drivers/mmc/host/sdhci-esdhc-imx.c\n"
- "@@ -217,6 +217,8 @@ static int esdhc_pltfm_init(struct sdhci_host *host, struct sdhci_pltfm_data *pd\n"
- " \t\t/* Now we have a working card_detect again */\n"
- " \t\thost->quirks &= ~SDHCI_QUIRK_BROKEN_CARD_DETECTION;\n"
- " \t}\n"
- "+\tif (cpu_is_mx51())\n"
- "+\t\thost->quirks &= ~SDHCI_QUIRK_BROKEN_CARD_DETECTION;\n"
- " \n"
- " \treturn 0;\n"
- " \n"
- "diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c\n"
- "index 9e15f41..11ef076 100644\n"
- "--- a/drivers/mmc/host/sdhci.c\n"
- "+++ b/drivers/mmc/host/sdhci.c\n"
- "@@ -127,10 +127,14 @@ static void sdhci_set_card_detection(struct sdhci_host *host, bool enable)\n"
- " \tif (host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION)\n"
- " \t\treturn;\n"
- " \n"
- "-\tif (enable)\n"
- "+\tsdhci_mask_irqs(host, irqs);\n"
- "+\tif (enable) {\n"
- "+\t\tif (!(sdhci_readl(host, SDHCI_PRESENT_STATE) & SDHCI_CARD_PRESENT))\n"
- "+\t\t\tirqs = SDHCI_INT_CARD_INSERT;\n"
- "+\t\telse\n"
- "+\t\t\tirqs = SDHCI_INT_CARD_REMOVE;\n"
- " \t\tsdhci_unmask_irqs(host, irqs);\n"
- "-\telse\n"
- "-\t\tsdhci_mask_irqs(host, irqs);\n"
- "+\t}\n"
- " }\n"
- " \n"
- " static void sdhci_enable_card_detection(struct sdhci_host *host)\n"
- "@@ -992,6 +996,9 @@ static void sdhci_set_clock(struct sdhci_host *host, unsigned int clock)\n"
- " \tu16 clk;\n"
- " \tunsigned long timeout;\n"
- " \n"
- "+\tif ((clock == 0) && (SDHCI_INT_CARD_INSERT & sdhci_readl(host, SDHCI_INT_ENABLE)))\n"
- "+\t\tgoto out;\n"
- "+\n"
- " \tif (clock == host->clock)\n"
- " \t\treturn;\n"
- " \n"
- "@@ -1001,6 +1008,7 @@ static void sdhci_set_clock(struct sdhci_host *host, unsigned int clock)\n"
- " \t\t\treturn;\n"
- " \t}\n"
- " \n"
- "+\n"
- " \tsdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);\n"
- " \n"
- " \tif (clock == 0)\n"
- "@@ -1583,9 +1591,18 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id)\n"
- " \tDBG(\"*** %s got interrupt: 0x%08x\\n\",\n"
- " \t\tmmc_hostname(host->mmc), intmask);\n"
- " \n"
- "-\tif (intmask & (SDHCI_INT_CARD_INSERT | SDHCI_INT_CARD_REMOVE)) {\n"
- "-\t\tsdhci_writel(host, intmask & (SDHCI_INT_CARD_INSERT |\n"
- "-\t\t\tSDHCI_INT_CARD_REMOVE), SDHCI_INT_STATUS);\n"
- "+\tif (intmask & SDHCI_INT_CARD_INSERT) {\n"
- "+\t\tsdhci_unmask_irqs(host, SDHCI_INT_CARD_REMOVE);\n"
- "+\t\tsdhci_mask_irqs(host, SDHCI_INT_CARD_INSERT);\n"
- "+\t\tsdhci_writel(host, intmask & SDHCI_INT_CARD_INSERT,\n"
- "+\t\t\tSDHCI_INT_STATUS);\n"
- "+\t\ttasklet_schedule(&host->card_tasklet);\n"
- "+\t}\n"
- "+\tif (intmask & SDHCI_INT_CARD_REMOVE) {\n"
- "+\t\tsdhci_unmask_irqs(host, SDHCI_INT_CARD_INSERT);\n"
- "+\t\tsdhci_mask_irqs(host, SDHCI_INT_CARD_REMOVE);\n"
- "+\t\tsdhci_writel(host, intmask & SDHCI_INT_CARD_REMOVE,\n"
- "+\t\t\tSDHCI_INT_STATUS);\n"
- " \t\ttasklet_schedule(&host->card_tasklet);\n"
- " \t}"
- "\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
+ "Eric\n"
+ "-------------- next part --------------\n"
+ "A non-text attachment was scrubbed...\n"
+ "Name: mx51_sdhci_cd_fix.patch\n"
+ "Type: text/x-patch\n"
+ "Size: 2488 bytes\n"
+ "Desc: not available\n"
+ URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110224/e118ff7a/attachment-0001.bin>
 
-0450f7aa604dda53aaf4dffbdf4f6ce507ffdb017b790f665a22fb5b2e118ee3
+153e04315fc4840d68e717bd67a46e51b5e8435f6f58f9d11155da4f91e64afd
