diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-17 11:13:42 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-17 11:13:42 -0700 |
| commit | 46cddc01aa6a017193ae7320ef8bfc8242782a66 (patch) | |
| tree | da67a2fb45e512689bf909b4f832a8daea57e140 /arch/arm/mach-omap2/mmc.h | |
| parent | 99f0b8d6b09b0db6452d0d6e252bfa28049bbea9 (diff) | |
| parent | 53db20d123f7a1bf44e46b727775403672655fde (diff) | |
| download | olio-linux-3.10-46cddc01aa6a017193ae7320ef8bfc8242782a66.tar.xz olio-linux-3.10-46cddc01aa6a017193ae7320ef8bfc8242782a66.zip | |
Merge branch 'omap-for-v3.8/cleanup-headers-mmc' into omap-for-v3.8/cleanup-headers
Conflicts:
arch/arm/mach-omap1/devices.c
arch/arm/mach-omap2/omap_hwmod_33xx_data.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
drivers/mmc/host/omap.c
Diffstat (limited to 'arch/arm/mach-omap2/mmc.h')
| -rw-r--r-- | arch/arm/mach-omap2/mmc.h | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/mmc.h b/arch/arm/mach-omap2/mmc.h new file mode 100644 index 00000000000..0cd4b089da9 --- /dev/null +++ b/arch/arm/mach-omap2/mmc.h @@ -0,0 +1,23 @@ +#include <linux/mmc/host.h> +#include <linux/platform_data/mmc-omap.h> + +#define OMAP24XX_NR_MMC 2 +#define OMAP2420_MMC_SIZE OMAP1_MMC_SIZE +#define OMAP2_MMC1_BASE 0x4809c000 + +#define OMAP4_MMC_REG_OFFSET 0x100 + +#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) +void omap242x_init_mmc(struct omap_mmc_platform_data **mmc_data); +#else +static inline void omap242x_init_mmc(struct omap_mmc_platform_data **mmc_data) +{ +} +#endif + +struct omap_hwmod; +int omap_msdi_reset(struct omap_hwmod *oh); + +/* called from board-specific card detection service routine */ +extern void omap_mmc_notify_cover_event(struct device *dev, int slot, + int is_closed); |