summaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.23/301-mmc_sdhci_fixes.patch
diff options
context:
space:
mode:
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-06-01 18:16:10 +0000
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-06-01 18:16:10 +0000
commit9f545e245bfb295d27244f41e6a927614b5680c0 (patch)
tree7b38bdc75edd61a80a8dd1846005185534667ae9 /target/linux/generic-2.6/patches-2.6.23/301-mmc_sdhci_fixes.patch
parent2dfc42c43808bfc118206d8c181b97ceea592ce1 (diff)
remove 2.6.23 support, as the last target using that has been nuked, too
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16275 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.23/301-mmc_sdhci_fixes.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.23/301-mmc_sdhci_fixes.patch152
1 files changed, 0 insertions, 152 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.23/301-mmc_sdhci_fixes.patch b/target/linux/generic-2.6/patches-2.6.23/301-mmc_sdhci_fixes.patch
deleted file mode 100644
index 666ba096a..000000000
--- a/target/linux/generic-2.6/patches-2.6.23/301-mmc_sdhci_fixes.patch
+++ /dev/null
@@ -1,152 +0,0 @@
---- a/drivers/mmc/host/sdhci.c
-+++ b/drivers/mmc/host/sdhci.c
-@@ -481,16 +481,16 @@ static void sdhci_finish_data(struct sdh
- * Controller doesn't count down when in single block mode.
- */
- if (data->blocks == 1)
-- blocks = (data->error == MMC_ERR_NONE) ? 0 : 1;
-+ blocks = (data->error == 0) ? 0 : 1;
- else
- blocks = readw(host->ioaddr + SDHCI_BLOCK_COUNT);
- data->bytes_xfered = data->blksz * (data->blocks - blocks);
-
-- if ((data->error == MMC_ERR_NONE) && blocks) {
-+ if (!data->error && blocks) {
- printk(KERN_ERR "%s: Controller signalled completion even "
- "though there were blocks left.\n",
- mmc_hostname(host->mmc));
-- data->error = MMC_ERR_FAILED;
-+ data->error = -EIO;
- }
-
- if (data->stop) {
-@@ -498,7 +498,7 @@ static void sdhci_finish_data(struct sdh
- * The controller needs a reset of internal state machines
- * upon error conditions.
- */
-- if (data->error != MMC_ERR_NONE) {
-+ if (data->error) {
- sdhci_reset(host, SDHCI_RESET_CMD);
- sdhci_reset(host, SDHCI_RESET_DATA);
- }
-@@ -533,7 +533,7 @@ static void sdhci_send_command(struct sd
- printk(KERN_ERR "%s: Controller never released "
- "inhibit bit(s).\n", mmc_hostname(host->mmc));
- sdhci_dumpregs(host);
-- cmd->error = MMC_ERR_FAILED;
-+ cmd->error = -EIO;
- tasklet_schedule(&host->finish_tasklet);
- return;
- }
-@@ -554,7 +554,7 @@ static void sdhci_send_command(struct sd
- if ((cmd->flags & MMC_RSP_136) && (cmd->flags & MMC_RSP_BUSY)) {
- printk(KERN_ERR "%s: Unsupported response type!\n",
- mmc_hostname(host->mmc));
-- cmd->error = MMC_ERR_INVALID;
-+ cmd->error = -EINVAL;
- tasklet_schedule(&host->finish_tasklet);
- return;
- }
-@@ -601,7 +601,7 @@ static void sdhci_finish_command(struct
- }
- }
-
-- host->cmd->error = MMC_ERR_NONE;
-+ host->cmd->error = 0;
-
- if (host->data && host->data_early)
- sdhci_finish_data(host);
-@@ -722,7 +722,7 @@ static void sdhci_request(struct mmc_hos
- host->mrq = mrq;
-
- if (!(readl(host->ioaddr + SDHCI_PRESENT_STATE) & SDHCI_CARD_PRESENT)) {
-- host->mrq->cmd->error = MMC_ERR_TIMEOUT;
-+ host->mrq->cmd->error = -ENOMEDIUM;
- tasklet_schedule(&host->finish_tasklet);
- } else
- sdhci_send_command(host, mrq->cmd);
-@@ -831,7 +831,7 @@ static void sdhci_tasklet_card(unsigned
- sdhci_reset(host, SDHCI_RESET_CMD);
- sdhci_reset(host, SDHCI_RESET_DATA);
-
-- host->mrq->cmd->error = MMC_ERR_FAILED;
-+ host->mrq->cmd->error = -ENOMEDIUM;
- tasklet_schedule(&host->finish_tasklet);
- }
- }
-@@ -859,9 +859,9 @@ static void sdhci_tasklet_finish(unsigne
- * The controller needs a reset of internal state machines
- * upon error conditions.
- */
-- if ((mrq->cmd->error != MMC_ERR_NONE) ||
-- (mrq->data && ((mrq->data->error != MMC_ERR_NONE) ||
-- (mrq->data->stop && (mrq->data->stop->error != MMC_ERR_NONE))))) {
-+ if (mrq->cmd->error ||
-+ (mrq->data && (mrq->data->error ||
-+ (mrq->data->stop && mrq->data->stop->error)))) {
-
- /* Some controllers need this kick or reset won't work here */
- if (host->chip->quirks & SDHCI_QUIRK_CLOCK_BEFORE_RESET) {
-@@ -906,13 +906,13 @@ static void sdhci_timeout_timer(unsigned
- sdhci_dumpregs(host);
-
- if (host->data) {
-- host->data->error = MMC_ERR_TIMEOUT;
-+ host->data->error = -ETIMEDOUT;
- sdhci_finish_data(host);
- } else {
- if (host->cmd)
-- host->cmd->error = MMC_ERR_TIMEOUT;
-+ host->cmd->error = -ETIMEDOUT;
- else
-- host->mrq->cmd->error = MMC_ERR_TIMEOUT;
-+ host->mrq->cmd->error = -ETIMEDOUT;
-
- tasklet_schedule(&host->finish_tasklet);
- }
-@@ -941,13 +941,12 @@ static void sdhci_cmd_irq(struct sdhci_h
- }
-
- if (intmask & SDHCI_INT_TIMEOUT)
-- host->cmd->error = MMC_ERR_TIMEOUT;
-- else if (intmask & SDHCI_INT_CRC)
-- host->cmd->error = MMC_ERR_BADCRC;
-- else if (intmask & (SDHCI_INT_END_BIT | SDHCI_INT_INDEX))
-- host->cmd->error = MMC_ERR_FAILED;
-+ host->cmd->error = -ETIMEDOUT;
-+ else if (intmask & (SDHCI_INT_CRC | SDHCI_INT_END_BIT |
-+ SDHCI_INT_INDEX))
-+ host->cmd->error = -EILSEQ;
-
-- if (host->cmd->error != MMC_ERR_NONE)
-+ if (host->cmd->error)
- tasklet_schedule(&host->finish_tasklet);
- else if (intmask & SDHCI_INT_RESPONSE)
- sdhci_finish_command(host);
-@@ -974,13 +973,11 @@ static void sdhci_data_irq(struct sdhci_
- }
-
- if (intmask & SDHCI_INT_DATA_TIMEOUT)
-- host->data->error = MMC_ERR_TIMEOUT;
-- else if (intmask & SDHCI_INT_DATA_CRC)
-- host->data->error = MMC_ERR_BADCRC;
-- else if (intmask & SDHCI_INT_DATA_END_BIT)
-- host->data->error = MMC_ERR_FAILED;
-+ host->data->error = -ETIMEDOUT;
-+ else if (intmask & (SDHCI_INT_DATA_CRC | SDHCI_INT_DATA_END_BIT))
-+ host->data->error = -EILSEQ;
-
-- if (host->data->error != MMC_ERR_NONE)
-+ if (host->data->error)
- sdhci_finish_data(host);
- else {
- if (intmask & (SDHCI_INT_DATA_AVAIL | SDHCI_INT_SPACE_AVAIL))
-@@ -1312,7 +1309,7 @@ static int __devinit sdhci_probe_slot(st
- mmc->ops = &sdhci_ops;
- mmc->f_min = host->max_clk / 256;
- mmc->f_max = host->max_clk;
-- mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_MULTIWRITE | MMC_CAP_BYTEBLOCK;
-+ mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_MULTIWRITE;
-
- if (caps & SDHCI_CAN_DO_HISPD)
- mmc->caps |= MMC_CAP_SD_HIGHSPEED;