summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-12-28 11:22:58 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-12-28 11:22:58 -0800
commit92a8cd42673f119896df7e964976c18952eb9970 (patch)
tree9292f8cc0c2259f354d5d122a9d85371c3dde7a0 /arch
parent88a58101608f1416f4c1ec81d88faed258a34b3d (diff)
parent274476f8fe0b6ac9bac542cc39de12c3dd0f43f6 (diff)
downloadop-kernel-dev-92a8cd42673f119896df7e964976c18952eb9970.zip
op-kernel-dev-92a8cd42673f119896df7e964976c18952eb9970.tar.gz
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')
-rw-r--r--arch/arm/mach-at91/include/mach/at91_mci.h2
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 57f8ee1..27ac6f5 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 @@
#define AT91_MCI_TRTYP_BLOCK (0 << 19)
#define AT91_MCI_TRTYP_MULTIPLE (1 << 19)
#define AT91_MCI_TRTYP_STREAM (2 << 19)
+#define AT91_MCI_TRTYP_SDIO_BYTE (4 << 19)
+#define AT91_MCI_TRTYP_SDIO_BLOCK (5 << 19)
#define AT91_MCI_BLKR 0x18 /* Block Register */
#define AT91_MCI_BLKR_BCNT(n) ((0xffff & (n)) << 0) /* Block count */
OpenPOWER on IntegriCloud