diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-27 01:16:29 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-27 01:16:29 +0300 |
| commit | 5c3b9bac28c62151f133a944fe14df5e153ae493 (patch) | |
| tree | f8159b142262aaa80406f2dbef744c012ffda113 /arch/arm | |
| parent | b127c6fb508f86542c3d5e460e1b99d2294360a6 (diff) | |
| parent | 15ec44611904be0dcc97b84c29fbf964e5e2b36f (diff) | |
| download | linux-5c3b9bac28c62151f133a944fe14df5e153ae493.tar.xz | |
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: sdhci: 8-bit bus width changes
mmc: sdio: fix runtime PM anomalies by introducing MMC_CAP_POWER_OFF_CARD
mmc: sdio: fix nasty oops in mmc_sdio_detect
mmc: omap4: hsmmc: Fix improper card detection while booting
mmc: fix rmmod race for hosts using card-detection polling
mmc: sdhci: Fix crash on boot with C0 stepping Moorestown platforms
mmc: sdhci-esdhc-imx: enable QUIRK_NO_MULTIBLOCK only for i.MX25 and i.MX35
mmc: sdhci-esdhc-imx: fix timeout on i.MX's sdhci
mmc: sdhci: Properly enable SDIO IRQ wakeups
mmc: ushc: Return proper error code for ushc_probe()
mmc: Fix printing of card DDR type
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/plat-pxa/include/plat/sdhci.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/plat-pxa/include/plat/sdhci.h b/arch/arm/plat-pxa/include/plat/sdhci.h index e49c5b6fc4e2..1ab332e37d7d 100644 --- a/arch/arm/plat-pxa/include/plat/sdhci.h +++ b/arch/arm/plat-pxa/include/plat/sdhci.h @@ -17,6 +17,9 @@ /* Require clock free running */ #define PXA_FLAG_DISABLE_CLOCK_GATING (1<<0) +/* Board design supports 8-bit data on SD/SDIO BUS */ +#define PXA_FLAG_SD_8_BIT_CAPABLE_SLOT (1<<2) + /* * struct pxa_sdhci_platdata() - Platform device data for PXA SDHCI * @max_speed: the maximum speed supported |