diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-28 14:22:58 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-28 14:22:58 -0500 |
| commit | 92a8cd42673f119896df7e964976c18952eb9970 (patch) | |
| tree | 9292f8cc0c2259f354d5d122a9d85371c3dde7a0 /arch/arm | |
| parent | 88a58101608f1416f4c1ec81d88faed258a34b3d (diff) | |
| parent | 274476f8fe0b6ac9bac542cc39de12c3dd0f43f6 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
mmc: Fix re-probing with PM_POST_RESTORE notification
mmc: atmel-mci: fix multiblock SDIO transfers
mmc: at91_mci: fix multiblock SDIO transfers
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-at91/include/mach/at91_mci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/include/mach/at91_mci.h b/arch/arm/mach-at91/include/mach/at91_mci.h index 57f8ee154943..27ac6f550fe3 100644 --- a/arch/arm/mach-at91/include/mach/at91_mci.h +++ b/arch/arm/mach-at91/include/mach/at91_mci.h | |||
| @@ -74,6 +74,8 @@ | |||
| 74 | #define AT91_MCI_TRTYP_BLOCK (0 << 19) | 74 | #define AT91_MCI_TRTYP_BLOCK (0 << 19) |
| 75 | #define AT91_MCI_TRTYP_MULTIPLE (1 << 19) | 75 | #define AT91_MCI_TRTYP_MULTIPLE (1 << 19) |
| 76 | #define AT91_MCI_TRTYP_STREAM (2 << 19) | 76 | #define AT91_MCI_TRTYP_STREAM (2 << 19) |
| 77 | #define AT91_MCI_TRTYP_SDIO_BYTE (4 << 19) | ||
| 78 | #define AT91_MCI_TRTYP_SDIO_BLOCK (5 << 19) | ||
| 77 | 79 | ||
| 78 | #define AT91_MCI_BLKR 0x18 /* Block Register */ | 80 | #define AT91_MCI_BLKR 0x18 /* Block Register */ |
| 79 | #define AT91_MCI_BLKR_BCNT(n) ((0xffff & (n)) << 0) /* Block count */ | 81 | #define AT91_MCI_BLKR_BCNT(n) ((0xffff & (n)) << 0) /* Block count */ |