diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2006-05-20 18:31:50 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-05-20 18:31:50 +0000 |
| commit | 61a3368e962e14767ccbd4f24456b362bedbfdd2 (patch) | |
| tree | 365738e7b61ac4c5ed95e64876acc334490c54f7 /packages/linux/linux-ezx/pxamci-4bit.patch | |
| parent | f89ded6650e53252ce92bb12072a47f63badc918 (diff) | |
| parent | 5dc648ea9c4ff5e7976f17459dc2fb685fcebc26 (diff) | |
merge of 17b5ed09da5a4cdb493874b746d2586d5ba53c86
and 8d5e1a3025b2da6e7d30136891450c13c77eacfe
Diffstat (limited to 'packages/linux/linux-ezx/pxamci-4bit.patch')
| -rw-r--r-- | packages/linux/linux-ezx/pxamci-4bit.patch | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/packages/linux/linux-ezx/pxamci-4bit.patch b/packages/linux/linux-ezx/pxamci-4bit.patch deleted file mode 100644 index 2e16c5fa27..0000000000 --- a/packages/linux/linux-ezx/pxamci-4bit.patch +++ /dev/null @@ -1,64 +0,0 @@ -Index: linux-2.6.16.5-a/drivers/mmc/pxamci.c -=================================================================== ---- linux-2.6.16.5-a.orig/drivers/mmc/pxamci.c 2006-05-04 17:10:57.000000000 +0200 -+++ linux-2.6.16.5-a/drivers/mmc/pxamci.c 2006-05-04 17:10:57.000000000 +0200 -@@ -60,6 +60,8 @@ - unsigned int power_mode; - struct pxamci_platform_data *pdata; - -+ unsigned int bus_width; -+ - struct mmc_request *mrq; - struct mmc_command *cmd; - struct mmc_data *data; -@@ -178,6 +180,9 @@ - if (cmd->flags & MMC_RSP_BUSY) - cmdat |= CMDAT_BUSY; - -+ if (host->bus_width == MMC_BUS_WIDTH_4) -+ cmdat |= CMDAT_SD_4DAT; -+ - #define RSP_TYPE(x) ((x) & ~(MMC_RSP_BUSY|MMC_RSP_OPCODE)) - switch (RSP_TYPE(mmc_resp_type(cmd))) { - case RSP_TYPE(MMC_RSP_R1): /* r1, r1b, r6 */ -@@ -409,8 +414,12 @@ - host->cmdat |= CMDAT_INIT; - } - -- DBG("pxamci_set_ios: clkrt = %x cmdat = %x\n", -- host->clkrt, host->cmdat); -+ /* Store bus width for later */ -+ if (host->mmc->caps & MMC_CAP_4_BIT_DATA) -+ host->bus_width = ios->bus_width; -+ -+ DBG("pxamci_set_ios: clkrt = %x cmdat = %x width = %x\n", -+ host->clkrt, host->cmdat, host->bus_width); - } - - static struct mmc_host_ops pxamci_ops = { -@@ -458,6 +467,9 @@ - mmc->ops = &pxamci_ops; - mmc->f_min = CLOCKRATE_MIN; - mmc->f_max = CLOCKRATE_MAX; -+#ifdef CONFIG_PXA27x -+ //mmc->caps = MMC_CAP_4_BIT_DATA; -+#endif - - /* - * We can do SG-DMA, but we don't because we never know how much -Index: linux-2.6.16.5-a/drivers/mmc/pxamci.h -=================================================================== ---- linux-2.6.16.5-a.orig/drivers/mmc/pxamci.h 2006-05-04 17:11:43.000000000 +0200 -+++ linux-2.6.16.5-a/drivers/mmc/pxamci.h 2006-05-04 17:12:08.000000000 +0200 -@@ -47,6 +47,11 @@ - #define SPI_EN (1 << 0) - - #define MMC_CMDAT 0x0010 -+#define CMDAT_SDIO_RESUME (1 << 13) /* PXA27x */ -+#define CMDAT_SDIO_SUSPEND (1 << 12) /* PXA27x */ -+#define CMDAT_SDIO_INT_EN (1 << 11) /* PXA27x */ -+#define CMDAT_STOP_TRAN (1 << 10) /* PXA27x */ -+#define CMDAT_SD_4DAT (1 << 8) /* PXA27x */ - #define CMDAT_DMAEN (1 << 7) - #define CMDAT_INIT (1 << 6) - #define CMDAT_BUSY (1 << 5) |