diff options
| author | Tom Rini <trini@ti.com> | 2012-09-12 10:26:06 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-09-12 10:26:06 -0700 |
| commit | a9ae14fce312c65cb3d26710afdd9b64a868dafc (patch) | |
| tree | 4d4f7a5ebde03703e8689eb64298d447aefdc26b /arch | |
| parent | c60a57912a3efcdcc087422a1e9ce2dc1b61e39d (diff) | |
| parent | 95b01c47ed97a7ca8b59308e35fb8c21e8d996a5 (diff) | |
| download | blackbird-obmc-uboot-a9ae14fce312c65cb3d26710afdd9b64a868dafc.tar.gz blackbird-obmc-uboot-a9ae14fce312c65cb3d26710afdd9b64a868dafc.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-mmc
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/include/asm/arch-exynos/mmc.h | 4 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-s5pc1xx/mmc.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/include/asm/arch-exynos/mmc.h b/arch/arm/include/asm/arch-exynos/mmc.h index 0f701c9012..afdfcf049d 100644 --- a/arch/arm/include/asm/arch-exynos/mmc.h +++ b/arch/arm/include/asm/arch-exynos/mmc.h @@ -64,11 +64,11 @@ #define SDHCI_CTRL4_DRIVE_MASK(_x) ((_x) << 16) #define SDHCI_CTRL4_DRIVE_SHIFT (16) -int s5p_sdhci_init(u32 regbase, u32 max_clk, u32 min_clk, u32 quirks); +int s5p_sdhci_init(u32 regbase, int index, int bus_width); static inline unsigned int s5p_mmc_init(int index, int bus_width) { unsigned int base = samsung_get_base_mmc() + (0x10000 * index); - return s5p_sdhci_init(base, 52000000, 400000, index); + return s5p_sdhci_init(base, index, bus_width); } #endif diff --git a/arch/arm/include/asm/arch-s5pc1xx/mmc.h b/arch/arm/include/asm/arch-s5pc1xx/mmc.h index 0f701c9012..afdfcf049d 100644 --- a/arch/arm/include/asm/arch-s5pc1xx/mmc.h +++ b/arch/arm/include/asm/arch-s5pc1xx/mmc.h @@ -64,11 +64,11 @@ #define SDHCI_CTRL4_DRIVE_MASK(_x) ((_x) << 16) #define SDHCI_CTRL4_DRIVE_SHIFT (16) -int s5p_sdhci_init(u32 regbase, u32 max_clk, u32 min_clk, u32 quirks); +int s5p_sdhci_init(u32 regbase, int index, int bus_width); static inline unsigned int s5p_mmc_init(int index, int bus_width) { unsigned int base = samsung_get_base_mmc() + (0x10000 * index); - return s5p_sdhci_init(base, 52000000, 400000, index); + return s5p_sdhci_init(base, index, bus_width); } #endif |
