Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

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

diff --git a/arch/arm/include/asm/arch-exynos/mmc.h b/arch/arm/include/asm/arch-exynos/mmc.h
index 96610b88f4d9903686bbbab3ef25b146f8b13262..0fb6461c08bcdefcbf513cf5a43361be768f7a41 100644 (file)
--- a/arch/arm/include/asm/arch-exynos/mmc.h
+++ b/arch/arm/include/asm/arch-exynos/mmc.h
@@ -8,6 +8,8 @@
 #ifndef __ASM_ARCH_MMC_H_
 #define __ASM_ARCH_MMC_H_
 
+#define S5P_MMC_DEV_OFFSET     0x10000
+
 #define SDHCI_CONTROL2         0x80
 #define SDHCI_CONTROL3         0x84
 #define SDHCI_CONTROL4         0x8C
@@ -51,11 +53,20 @@
 #define SDHCI_CTRL4_DRIVE_MASK(_x)     ((_x) << 16)
 #define SDHCI_CTRL4_DRIVE_SHIFT                (16)
 
+#define SDHCI_MAX_HOSTS 4
+
 int s5p_sdhci_init(u32 regbase, int index, int bus_width);
 
-static inline unsigned int s5p_mmc_init(int index, int bus_width)
+static inline int s5p_mmc_init(int index, int bus_width)
 {
-       unsigned int base = samsung_get_base_mmc() + (0x10000 * index);
+       unsigned int base = samsung_get_base_mmc() +
+                               (S5P_MMC_DEV_OFFSET * index);
+
        return s5p_sdhci_init(base, index, bus_width);
 }
+
+#ifdef CONFIG_OF_CONTROL
+int exynos_mmc_init(const void *blob);
+#endif
+
 #endif