-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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: (53 commits) mmc: dw_mmc: support mmc power control with regulator mmc: dw_mmc: fix suspend/resume operation mmc: dw_mmc: add quirks for unreliable card detect, and capabilities mmc: tmio: fix address in kunmap_atomic() calls mmc: core: reset card voltage after power off mmc: core: export function mmc_do_release_host() mmc: sdio: remember new card RCA when redetecting card mmc: dw_mmc: Remove set-but-unused variable. mmc: sdhci-esdhc-imx: add card detect on custom GPIO for mx25/35 mmc: sdhci-esdhc: broken card detection is not a default quirk mmc: sdhci-esdhc-imx: add write protect on custom GPIO on mx25/35 mmc: msm_sdcc: remove needless cache flush after dma_unmap_sg() mmc: sh_mmcif: support aggressive clock gating mmc: check if mmc cards < 2GB do sector addressing mmc: core: comment on why sdio_reset is done at init time mmc: dw_mmc: support DDR mode mmc: via-sdmmc: Remove set-but-unused variable. mmc: cb710: Return err value in cb710_wait_while_busy() mmc: sdhci-pci: Remove set-but-unused variable. mmc: mxs-mmc: add mmc host driver for i.MX23/28 ...
- Loading branch information
Showing
36 changed files
with
1,810 additions
and
258 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
What: /sys/devices/.../mmc_host/mmcX/mmcX:XXXX/enhanced_area_offset | ||
Date: January 2011 | ||
Contact: Chuanxiao Dong <chuanxiao.dong@intel.com> | ||
Description: | ||
Enhanced area is a new feature defined in eMMC4.4 standard. | ||
eMMC4.4 or later card can support such feature. This kind of | ||
area can help to improve the card performance. If the feature | ||
is enabled, this attribute will indicate the start address of | ||
enhanced data area. If not, this attribute will be -EINVAL. | ||
Unit Byte. Format decimal. | ||
|
||
What: /sys/devices/.../mmc_host/mmcX/mmcX:XXXX/enhanced_area_size | ||
Date: January 2011 | ||
Contact: Chuanxiao Dong <chuanxiao.dong@intel.com> | ||
Description: | ||
Enhanced area is a new feature defined in eMMC4.4 standard. | ||
eMMC4.4 or later card can support such feature. This kind of | ||
area can help to improve the card performance. If the feature | ||
is enabled, this attribute will indicate the size of enhanced | ||
data area. If not, this attribute will be -EINVAL. | ||
Unit KByte. Format decimal. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
/* | ||
* Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved. | ||
* | ||
* This program is free software; you can redistribute it and/or modify | ||
* it under the terms of the GNU General Public License version 2 as | ||
* published by the Free Software Foundation. | ||
*/ | ||
|
||
#ifndef __MACH_MXS_MMC_H__ | ||
#define __MACH_MXS_MMC_H__ | ||
|
||
struct mxs_mmc_platform_data { | ||
int wp_gpio; /* write protect pin */ | ||
unsigned int flags; | ||
#define SLOTF_4_BIT_CAPABLE (1 << 0) | ||
#define SLOTF_8_BIT_CAPABLE (1 << 1) | ||
}; | ||
#endif /* __MACH_MXS_MMC_H__ */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.