diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 12:33:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 12:33:42 -0400 |
| commit | 00ebb6382b8d9c7c15b5f8ad230670d8161d38dd (patch) | |
| tree | 23591394b83776953aaf0b382d4c7b09e0ca1e34 /arch | |
| parent | 11cc21f5f5575b9abd14d53a6055ccbf72b67573 (diff) | |
| parent | 536ac998f6076a0ae423b1046b85d7690e8b7107 (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: (66 commits)
mmc: add new sdhci-pxa driver for Marvell SoCs
mmc: make number of mmcblk minors configurable
mmc_spi: Recover from CRC errors for r/w operation over SPI.
mmc: sdhci-pltfm: add -pltfm driver for imx35/51
mmc: sdhci-of-esdhc: factor out common stuff
mmc: sdhci_pltfm: pass more data on custom init call
mmc: sdhci: introduce get_ro private write-protect hook
mmc: sdhci-pltfm: move .h file into appropriate subdir
mmc: sdhci-pltfm: Add structure for host-specific data
mmc: fix cb710 kconfig dependency warning
mmc: cb710: remove debugging printk (info duplicated from mmc-core)
mmc: cb710: clear irq handler on init() error path
mmc: cb710: remove unnecessary msleep()
mmc: cb710: implement get_cd() callback
mmc: cb710: partially demystify clock selection
mmc: add a file to debugfs for changing host clock at runtime
mmc: sdhci: allow for eMMC 74 clock generation by controller
mmc: sdhci: highspeed: check for mmc as well as sd cards
mmc: sdhci: Add Moorestown device support
mmc: sdhci: Intel Medfield support
...
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/plat-pxa/include/plat/sdhci.h | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/arch/arm/plat-pxa/include/plat/sdhci.h b/arch/arm/plat-pxa/include/plat/sdhci.h new file mode 100644 index 000000000000..e49c5b6fc4e2 --- /dev/null +++ b/arch/arm/plat-pxa/include/plat/sdhci.h | |||
| @@ -0,0 +1,32 @@ | |||
| 1 | /* linux/arch/arm/plat-pxa/include/plat/sdhci.h | ||
| 2 | * | ||
| 3 | * Copyright 2010 Marvell | ||
| 4 | * Zhangfei Gao <zhangfei.gao@marvell.com> | ||
| 5 | * | ||
| 6 | * PXA Platform - SDHCI platform data definitions | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License version 2 as | ||
| 10 | * published by the Free Software Foundation. | ||
| 11 | */ | ||
| 12 | |||
| 13 | #ifndef __PLAT_PXA_SDHCI_H | ||
| 14 | #define __PLAT_PXA_SDHCI_H | ||
| 15 | |||
| 16 | /* pxa specific flag */ | ||
| 17 | /* Require clock free running */ | ||
| 18 | #define PXA_FLAG_DISABLE_CLOCK_GATING (1<<0) | ||
| 19 | |||
| 20 | /* | ||
| 21 | * struct pxa_sdhci_platdata() - Platform device data for PXA SDHCI | ||
| 22 | * @max_speed: the maximum speed supported | ||
| 23 | * @quirks: quirks of specific device | ||
| 24 | * @flags: flags for platform requirement | ||
| 25 | */ | ||
| 26 | struct sdhci_pxa_platdata { | ||
| 27 | unsigned int max_speed; | ||
| 28 | unsigned int quirks; | ||
| 29 | unsigned int flags; | ||
| 30 | }; | ||
| 31 | |||
| 32 | #endif /* __PLAT_PXA_SDHCI_H */ | ||