diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-10 23:41:06 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-10 23:41:06 -0700 |
| commit | b335d89cd455ef89c734b9a25de1ab0e745363eb (patch) | |
| tree | ecffb7e92f5eaf9c3f316729d4efb665d600c916 /arch/arm/plat-omap/include/plat/mmc.h | |
| parent | 620340cad8e1d331f4002ded12ee4e284de869c9 (diff) | |
| parent | bfd17879866b36e95c58721da070d9f2ac7f8901 (diff) | |
| download | op-kernel-dev-b335d89cd455ef89c734b9a25de1ab0e745363eb.zip op-kernel-dev-b335d89cd455ef89c734b9a25de1ab0e745363eb.tar.gz | |
Merge tag 'omap-devel-hwmod-data-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/pm
Data changes related to omap hwmod
By Paul Walmsley (4) and others
via Paul Walmsley (1) and Tony Lindgren (1)
* tag 'omap-devel-hwmod-data-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: WDTIMER integration: fix !PM boot crash, disarm timer after hwmod reset
ARM: OMAP2/3: hwmod data: Add 32k-sync timer data to hwmod database
ARM: OMAP4: hwmod_data: Name the common irq for McBSP ports
ARM: OMAP4: hwmod data: I2C: add flag for context restore
ARM: OMAP3: hwmod_data: Rename the common irq for McBSP ports
ARM: OMAP2xxx: hwmod data: add HDQ/1-wire hwmod
ARM: OMAP3: hwmod data: add HDQ/1-wire hwmod
ARM: OMAP2+: hwmod data: add HDQ/1-wire hwmod shared data
ARM: OMAP2+: HDQ1W: add custom reset function
ARM: OMAP2420: hwmod data: Add MMC hwmod data for 2420
Diffstat (limited to 'arch/arm/plat-omap/include/plat/mmc.h')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/mmc.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/plat/mmc.h b/arch/arm/plat-omap/include/plat/mmc.h index 7a38750..3e7ae0f 100644 --- a/arch/arm/plat-omap/include/plat/mmc.h +++ b/arch/arm/plat-omap/include/plat/mmc.h @@ -16,6 +16,7 @@ #include <linux/mmc/host.h> #include <plat/board.h> +#include <plat/omap_hwmod.h> #define OMAP15XX_NR_MMC 1 #define OMAP16XX_NR_MMC 2 @@ -195,4 +196,7 @@ static inline int omap_mmc_add(const char *name, int id, unsigned long base, } #endif + +extern int omap_msdi_reset(struct omap_hwmod *oh); + #endif |
