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

[oweals/u-boot.git] / arch / arm / include / asm / arch-sunxi / mmc.h

diff --git a/arch/arm/include/asm/arch-sunxi/mmc.h b/arch/arm/include/asm/arch-sunxi/mmc.h
index 53196e3b024c68f3232a1596f29910f16f2131f0..3da360b177d9b2a0369745f253a759652aac32ca 100644 (file)
--- a/arch/arm/include/asm/arch-sunxi/mmc.h
+++ b/arch/arm/include/asm/arch-sunxi/mmc.h
@@ -43,7 +43,10 @@ struct sunxi_mmc {
        u32 chda;               /* 0x90 */
        u32 cbda;               /* 0x94 */
        u32 res1[26];
-       u32 fifo;               /* 0x100 FIFO access address */
+#ifdef CONFIG_SUNXI_GEN_SUN6I
+       u32 res2[64];
+#endif
+       u32 fifo;               /* 0x100 / 0x200 FIFO access address */
 };
 
 #define SUNXI_MMC_CLK_POWERSAVE                (0x1 << 17)
@@ -120,5 +123,9 @@ struct sunxi_mmc {
 #define SUNXI_MMC_IDIE_TXIRQ           (0x1 << 0)
 #define SUNXI_MMC_IDIE_RXIRQ           (0x1 << 1)
 
-int sunxi_mmc_init(int sdc_no);
+#define SUNXI_MMC_COMMON_CLK_GATE              (1 << 16)
+#define SUNXI_MMC_COMMON_RESET                 (1 << 18)
+
+struct mmc *sunxi_mmc_init(int sdc_no);
+int sunxi_mmc_has_egon_boot_signature(struct mmc *mmc);
 #endif /* _SUNXI_MMC_H */