From: Jagannadha Sutradharudu Teki <jagannadha.sutradharudu-teki@xilinx.com>
Date: Tue, 9 Apr 2013 06:30:30 +0000 (+0530)
Subject: zynq: sdhci: Move zynq_sdhci_init out of mmc.h
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b200814b6fe3cf7917a0400fbae538b730d999ab;p=thirdparty%2Fu-boot.git

zynq: sdhci: Move zynq_sdhci_init out of mmc.h

Call zynq_sdhci_init directly from board.c so no need to define
zynq_mmc_init separately hence removed.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/arch/arm/include/asm/arch-zynq/mmc.h b/arch/arm/include/asm/arch-zynq/mmc.h
index 3077f7a2f41..de0155a7d64 100644
--- a/arch/arm/include/asm/arch-zynq/mmc.h
+++ b/arch/arm/include/asm/arch-zynq/mmc.h
@@ -23,15 +23,6 @@
 #ifndef __ASM_ARCH_MMC_H_
 #define __ASM_ARCH_MMC_H_
 
-#include <config.h>
-
 int zynq_sdhci_init(u32 regbase);
 
-static inline int zynq_mmc_init(bd_t *bd)
-{
-	u32 regbase = (u32) SD_BASEADDR;
-
-	return zynq_sdhci_init(regbase);
-}
-
 #endif /* __ASM_ARCH_MMC_H_ */
diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c
index 3bb90f51479..b09a2eae857 100644
--- a/board/xilinx/zynq/board.c
+++ b/board/xilinx/zynq/board.c
@@ -158,7 +158,12 @@ int board_eth_init(bd_t *bis)
 #ifdef CONFIG_CMD_MMC
 int board_mmc_init(bd_t *bd)
 {
-	return zynq_mmc_init(bd);
+	int ret = 0;
+
+#if defined(CONFIG_SDHCI) && defined(CONFIG_ZYNQ_SDHCI)
+	ret = zynq_sdhci_init(SD_BASEADDR);
+#endif
+	return ret;
 }
 #endif