mirror of
https://github.com/u-boot/u-boot.git
synced 2024-11-27 22:56:49 +08:00
Revert "AT91:mmc:fix multiple read/write error"
This reverts commit c310fc8404
.
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 <afleming@freescale.com>
This commit is contained in:
parent
33a6b9e90b
commit
0011401dfe
@ -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
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user