From caaeae48850bb3306978f79bdd3beb4873998f9e Mon Sep 17 00:00:00 2001
From: Bridge Wu <mingqiao.wu@gmail.com>
Date: Tue, 25 Sep 2007 19:09:19 +0200
Subject: [PATCH] --- yaml --- r: 65646 b: refs/heads/master c:
 df456f479aa6fdc812df51627c6f2c21d8a1aed8 h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/mmc/host/pxamci.c | 10 +++++++++-
 trunk/drivers/mmc/host/pxamci.h |  1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e1666153e177..fb869347a330 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe2dc44eac1223a0e92859242f58fd2a58a6f8fa
+refs/heads/master: df456f479aa6fdc812df51627c6f2c21d8a1aed8
diff --git a/trunk/drivers/mmc/host/pxamci.c b/trunk/drivers/mmc/host/pxamci.c
index 67acc6a00895..6549f546df55 100644
--- a/trunk/drivers/mmc/host/pxamci.c
+++ b/trunk/drivers/mmc/host/pxamci.c
@@ -284,7 +284,7 @@ static int pxamci_data_done(struct pxamci_host *host, unsigned int stat)
 	host->data = NULL;
 	if (host->mrq->stop) {
 		pxamci_stop_clock(host);
-		pxamci_start_cmd(host, host->mrq->stop, 0);
+		pxamci_start_cmd(host, host->mrq->stop, host->cmdat);
 	} else {
 		pxamci_finish_request(host, host->mrq);
 	}
@@ -382,6 +382,11 @@ static void pxamci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 			host->cmdat |= CMDAT_INIT;
 	}
 
+	if (ios->bus_width == MMC_BUS_WIDTH_4)
+		host->cmdat |= CMDAT_SD_4DAT;
+	else
+		host->cmdat &= ~CMDAT_SD_4DAT;
+
 	pr_debug("PXAMCI: clkrt = %x cmdat = %x\n",
 		 host->clkrt, host->cmdat);
 }
@@ -460,6 +465,9 @@ static int pxamci_probe(struct platform_device *pdev)
 	mmc->ocr_avail = host->pdata ?
 			 host->pdata->ocr_mask :
 			 MMC_VDD_32_33|MMC_VDD_33_34;
+	mmc->caps = 0;
+	if (!cpu_is_pxa21x() && !cpu_is_pxa25x())
+		mmc->caps |= MMC_CAP_4_BIT_DATA;
 
 	host->sg_cpu = dma_alloc_coherent(&pdev->dev, PAGE_SIZE, &host->sg_dma, GFP_KERNEL);
 	if (!host->sg_cpu) {
diff --git a/trunk/drivers/mmc/host/pxamci.h b/trunk/drivers/mmc/host/pxamci.h
index df17c281278a..5655be823a00 100644
--- a/trunk/drivers/mmc/host/pxamci.h
+++ b/trunk/drivers/mmc/host/pxamci.h
@@ -25,6 +25,7 @@
 #define SPI_EN			(1 << 0)
 
 #define MMC_CMDAT	0x0010
+#define CMDAT_SD_4DAT		(1 << 8)
 #define CMDAT_DMAEN		(1 << 7)
 #define CMDAT_INIT		(1 << 6)
 #define CMDAT_BUSY		(1 << 5)