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

zynq: Add CONFIG_ZYNQ_SDHCI1 support

This patch provides a support to use SDHCI1 on existing zynq_sdhci.c
driver. defined regbase as -> CONFIG_ZYNQ_SDHCI_BASEADDR1 and
max, min clock values are initialized as 0.

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

diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c
index 68626a37729..0fb99a47bd0 100644
--- a/board/xilinx/zynq/board.c
+++ b/board/xilinx/zynq/board.c
@@ -164,6 +164,9 @@ int board_mmc_init(bd_t *bd)
 # if defined(CONFIG_ZYNQ_SDHCI_BASEADDR0)
 	ret = zynq_sdhci_init(CONFIG_ZYNQ_SDHCI_BASEADDR0);
 # endif
+# if defined(CONFIG_ZYNQ_SDHCI_BASEADDR1)
+	ret |= zynq_sdhci_init(CONFIG_ZYNQ_SDHCI_BASEADDR1);
+# endif
 #endif
 	return ret;
 }
diff --git a/include/configs/zynq_common.h b/include/configs/zynq_common.h
index e54b19134e1..424598ce0e4 100644
--- a/include/configs/zynq_common.h
+++ b/include/configs/zynq_common.h
@@ -145,7 +145,11 @@
 # define CONFIG_ZYNQ_SDHCI_BASEADDR0	0xE0100000
 #endif
 
-#if defined(CONFIG_ZYNQ_SDHCI0)
+#ifdef CONFIG_ZYNQ_SDHCI1
+# define CONFIG_ZYNQ_SDHCI_BASEADDR1	0xE0101000
+#endif
+
+#if defined(CONFIG_ZYNQ_SDHCI0) || defined(CONFIG_ZYNQ_SDHCI1)
 # define CONFIG_MMC
 # define CONFIG_GENERIC_MMC
 # define CONFIG_SDHCI