diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-08-02 22:39:36 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-08-02 22:39:36 +0200 |
| commit | d50a8f45c9a640b3bcbd0ede91f83c8646cca018 (patch) | |
| tree | 3daaa8676b781ab8c478f390d5411a798f276866 /drivers | |
| parent | 7432ed05a3b59e2dc919ab3c74fb2114177bf1a3 (diff) | |
| parent | 0011401dfeb5699c8179c49f003ac1180aa2bf95 (diff) | |
| download | blackbird-obmc-uboot-d50a8f45c9a640b3bcbd0ede91f83c8646cca018.tar.gz blackbird-obmc-uboot-d50a8f45c9a640b3bcbd0ede91f83c8646cca018.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-mmc
* 'master' of git://git.denx.de/u-boot-mmc:
Revert "AT91:mmc:fix multiple read/write error"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/atmel_mci.h | 9 | ||||
| -rw-r--r-- | drivers/mmc/gen_atmel_mci.c | 4 |
2 files changed, 1 insertions, 12 deletions
diff --git a/drivers/mmc/atmel_mci.h b/drivers/mmc/atmel_mci.h index 3095d22e68..90ab6a8a6d 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 d217574b57..f346b244be 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); |
