From: Tim Harvey <tharvey@gateworks.com>
Date: Fri, 8 Aug 2014 05:35:51 +0000 (-0700)
Subject: imx: ventana: leave PCI reset de-asserted if PCI enabled
X-Git-Tag: v2014.10-rc2~52^2~4
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6a9032112e1bca8bab974b5da9a03b37d49538a6;p=oweals%2Fu-boot.git

imx: ventana: leave PCI reset de-asserted if PCI enabled

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
---

diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c
index 67a646c059..2915b9057f 100644
--- a/board/gateworks/gw_ventana/gw_ventana.c
+++ b/board/gateworks/gw_ventana/gw_ventana.c
@@ -995,12 +995,10 @@ static void setup_board_gpio(int board)
 		gpio_direction_output(GP_MSATA_SEL, 0);
 	}
 
-	/*
-	 * assert PCI_RST# (released by OS when clock is valid)
-	 * TODO: figure out why leaving this de-asserted from PCI scan on boot
-	 *       causes linux pcie driver to hang during enumeration
-	 */
+#if !defined(CONFIG_CMD_PCI)
+	/* assert PCI_RST# (released by OS when clock is valid) */
 	gpio_direction_output(gpio_cfg[board].pcie_rst, 0);
+#endif
 
 	/* turn off (active-high) user LED's */
 	for (i = 0; i < 4; i++) {