From 0011401dfeb5699c8179c49f003ac1180aa2bf95 Mon Sep 17 00:00:00 2001 From: Andy Fleming Date: Thu, 28 Jul 2011 20:47:02 -0500 Subject: [PATCH] Revert "AT91:mmc:fix multiple read/write error" This reverts commit c310fc840472a36e4b9d2505830e9dc8d458d63c. The Atmel custodian had apparently rejected this patch's approach in another thread, so this patch reverts it for now. Signed-off-by: Andy Fleming --- drivers/mmc/atmel_mci.h | 9 +-------- drivers/mmc/gen_atmel_mci.c | 4 ---- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/mmc/atmel_mci.h b/drivers/mmc/atmel_mci.h index 3095d22..90ab6a8 100644 --- a/drivers/mmc/atmel_mci.h +++ b/drivers/mmc/atmel_mci.h @@ -36,7 +36,7 @@ typedef struct atmel_mci { u32 sdcr; /* 0x0c */ u32 argr; /* 0x10 */ u32 cmdr; /* 0x14 */ - u32 blkr; /* 0x18 */ + u32 _18; /* 0x18 */ u32 _1c; /* 0x1c */ u32 rspr; /* 0x20 */ u32 rspr1; /* 0x24 */ @@ -67,7 +67,6 @@ typedef struct atmel_mci { #define MMCI_SDCR 0x000c #define MMCI_ARGR 0x0010 #define MMCI_CMDR 0x0014 -#define MMCI_BLKR 0x0018 #define MMCI_RSPR 0x0020 #define MMCI_RSPR1 0x0024 #define MMCI_RSPR2 0x0028 @@ -141,12 +140,6 @@ typedef struct atmel_mci { #define MMCI_TRTYP_OFFSET 19 #define MMCI_TRTYP_SIZE 2 -/* Bitfields in BLKR */ -#define MMCI_BCNT_OFFSET 0 -#define MMCI_BCNT_SIZE 16 -#define MMCI_BLKLEN_OFFSET 16 -#define MMCI_BLKLEN_SIZE 16 - /* Bitfields in RSPRx */ #define MMCI_RSP_OFFSET 0 #define MMCI_RSP_SIZE 32 diff --git a/drivers/mmc/gen_atmel_mci.c b/drivers/mmc/gen_atmel_mci.c index d217574..f346b24 100644 --- a/drivers/mmc/gen_atmel_mci.c +++ b/drivers/mmc/gen_atmel_mci.c @@ -183,10 +183,6 @@ mci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data) /* Figure out the transfer arguments */ cmdr = mci_encode_cmd(cmd, data, &error_flags); - if (data) - writel(MMCI_BF(BCNT, data->blocks) | - MMCI_BF(BLKLEN, mmc->read_bl_len), &mci->blkr); - /* Send the command */ writel(cmd->cmdarg, &mci->argr); writel(cmdr, &mci->cmdr); -- 2.7.4