Merge branch 'master' of git://git.denx.de/u-boot-i2c

[u-boot] / arch / arm / include / asm / omap_mmc.h

diff --git a/arch/arm/include/asm/omap_mmc.h b/arch/arm/include/asm/omap_mmc.h
index 83726ee0a241b41f09932b260decea96c07777be..f2bf645b33b1d438c6aaf10d27e388e8ac8b6bec 100644 (file)
--- a/arch/arm/include/asm/omap_mmc.h
+++ b/arch/arm/include/asm/omap_mmc.h
@@ -26,6 +26,9 @@
 #define OMAP_MMC_H_
 
 struct hsmmc {
+#ifdef CONFIG_DM_MMC
+       unsigned char res0[0x100];
+#endif
        unsigned char res1[0x10];
        unsigned int sysconfig;         /* 0x10 */
        unsigned int sysstatus;         /* 0x14 */
@@ -161,7 +164,8 @@ struct hsmmc {
 #define mmc_reg_out(addr, mask, val)\
        writel((readl(addr) & (~(mask))) | ((val) & (mask)), (addr))
 
-int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max);
-
+int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio,
+               int wp_gpio);
 
+void vmmc_pbias_config(uint voltage);
 #endif /* OMAP_MMC_H_ */