diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-19 01:32:40 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-19 01:32:40 -0400 |
commit | a8c91da549f625d0600d5bd7e1831066b55edf0d (patch) | |
tree | 494738b095d7c96286c7b0d0d586c7b8fa594f5a /arch | |
parent | 26b95cac5fddb2916e2cef76495073f9c37a7b54 (diff) | |
parent | c07946a3350244d7c3d9bc1032325e04dd11575b (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: (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
...
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-mxs/include/mach/mmc.h | 18 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/esdhc.h | 12 |
2 files changed, 29 insertions, 1 deletions
diff --git a/arch/arm/mach-mxs/include/mach/mmc.h b/arch/arm/mach-mxs/include/mach/mmc.h new file mode 100644 index 000000000000..211547a05564 --- /dev/null +++ b/arch/arm/mach-mxs/include/mach/mmc.h | |||
@@ -0,0 +1,18 @@ | |||
1 | /* | ||
2 | * Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved. | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License version 2 as | ||
6 | * published by the Free Software Foundation. | ||
7 | */ | ||
8 | |||
9 | #ifndef __MACH_MXS_MMC_H__ | ||
10 | #define __MACH_MXS_MMC_H__ | ||
11 | |||
12 | struct mxs_mmc_platform_data { | ||
13 | int wp_gpio; /* write protect pin */ | ||
14 | unsigned int flags; | ||
15 | #define SLOTF_4_BIT_CAPABLE (1 << 0) | ||
16 | #define SLOTF_8_BIT_CAPABLE (1 << 1) | ||
17 | }; | ||
18 | #endif /* __MACH_MXS_MMC_H__ */ | ||
diff --git a/arch/arm/plat-mxc/include/mach/esdhc.h b/arch/arm/plat-mxc/include/mach/esdhc.h index a48a9aaa56b1..86003f411755 100644 --- a/arch/arm/plat-mxc/include/mach/esdhc.h +++ b/arch/arm/plat-mxc/include/mach/esdhc.h | |||
@@ -10,7 +10,17 @@ | |||
10 | #ifndef __ASM_ARCH_IMX_ESDHC_H | 10 | #ifndef __ASM_ARCH_IMX_ESDHC_H |
11 | #define __ASM_ARCH_IMX_ESDHC_H | 11 | #define __ASM_ARCH_IMX_ESDHC_H |
12 | 12 | ||
13 | /** | ||
14 | * struct esdhc_platform_data - optional platform data for esdhc on i.MX | ||
15 | * | ||
16 | * strongly recommended for i.MX25/35, not needed for other variants | ||
17 | * | ||
18 | * @wp_gpio: gpio for write_protect (-EINVAL if unused) | ||
19 | * @cd_gpio: gpio for card_detect interrupt (-EINVAL if unused) | ||
20 | */ | ||
21 | |||
13 | struct esdhc_platform_data { | 22 | struct esdhc_platform_data { |
14 | unsigned int wp_gpio; /* write protect pin */ | 23 | unsigned int wp_gpio; |
24 | unsigned int cd_gpio; | ||
15 | }; | 25 | }; |
16 | #endif /* __ASM_ARCH_IMX_ESDHC_H */ | 26 | #endif /* __ASM_ARCH_IMX_ESDHC_H */ |