git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
mmc
/
imxmmc.c
diff --git
a/drivers/mmc/imxmmc.c
b/drivers/mmc/imxmmc.c
index
fb6565b
..
bfb9ff6
100644
(file)
--- a/
drivers/mmc/imxmmc.c
+++ b/
drivers/mmc/imxmmc.c
@@
-351,9
+351,6
@@
static void imxmci_start_cmd(struct imxmci_host *host, struct mmc_command *cmd,
case MMC_RSP_R3: /* short */
cmdat |= CMD_DAT_CONT_RESPONSE_FORMAT_R3;
break;
case MMC_RSP_R3: /* short */
cmdat |= CMD_DAT_CONT_RESPONSE_FORMAT_R3;
break;
- case MMC_RSP_R6: /* short CRC */
- cmdat |= CMD_DAT_CONT_RESPONSE_FORMAT_R6;
- break;
default:
break;
}
default:
break;
}
@@
-635,7
+632,7
@@
static int imxmci_cpu_driven_data(struct imxmci_host *host, unsigned int *pstat)
return trans_done;
}
return trans_done;
}
-static void imxmci_dma_irq(int dma, void *devid
, struct pt_regs *regs
)
+static void imxmci_dma_irq(int dma, void *devid)
{
struct imxmci_host *host = devid;
uint32_t stat = MMC_STATUS;
{
struct imxmci_host *host = devid;
uint32_t stat = MMC_STATUS;
@@
-646,7
+643,7
@@
static void imxmci_dma_irq(int dma, void *devid, struct pt_regs *regs)
tasklet_schedule(&host->tasklet);
}
tasklet_schedule(&host->tasklet);
}
-static irqreturn_t imxmci_irq(int irq, void *devid
, struct pt_regs *regs
)
+static irqreturn_t imxmci_irq(int irq, void *devid)
{
struct imxmci_host *host = devid;
uint32_t stat = MMC_STATUS;
{
struct imxmci_host *host = devid;
uint32_t stat = MMC_STATUS;
@@
-877,7
+874,7
@@
static void imxmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
}
}
}
}
-static struct mmc_host_ops imxmci_ops = {
+static
const
struct mmc_host_ops imxmci_ops = {
.request = imxmci_request,
.set_ios = imxmci_set_ios,
};
.request = imxmci_request,
.set_ios = imxmci_set_ios,
};
@@
-956,7
+953,7
@@
static int imxmci_probe(struct platform_device *pdev)
mmc->f_min = 150000;
mmc->f_max = CLK_RATE/2;
mmc->ocr_avail = MMC_VDD_32_33;
mmc->f_min = 150000;
mmc->f_max = CLK_RATE/2;
mmc->ocr_avail = MMC_VDD_32_33;
- mmc->caps
|= MMC_CAP_4_BIT_DATA
;
+ mmc->caps
= MMC_CAP_4_BIT_DATA | MMC_CAP_BYTEBLOCK
;
/* MMC core transfer sizes tunable parameters */
mmc->max_hw_segs = 64;
/* MMC core transfer sizes tunable parameters */
mmc->max_hw_segs = 64;